summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-05 13:13:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-05 13:13:10 -0800
commit3630be2749819b79de917a77c6627e3f84c00a11 (patch)
treea2a7fe1e31a4817b0f1b0d8548a6d5c9ed931a20 /t/t6023-merge-file.sh
parentMerge branch 'jk/prune-mtime' into maint (diff)
parentgit-submodule.sh: fix '/././' path normalization (diff)
downloadtgif-3630be2749819b79de917a77c6627e3f84c00a11.tar.xz
Merge branch 'ps/submodule-sanitize-path-upon-add' into maint
"git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions