summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-08 21:35:54 -0700
commit8e7c580e34a95576966516d2a6d45fd2c4c00180 (patch)
tree5b1a55845d3836f246269bfb7d9c0c6a3dd610ca /Documentation/git-mergetool--lib.txt
parentMerge branch 'js/import-tars-hardlinks' into maint (diff)
parentgit mv: do not keep slash in `git mv dir non-existing-dir/` (diff)
downloadtgif-8e7c580e34a95576966516d2a6d45fd2c4c00180.tar.xz
Merge branch 'js/mv-dir-to-new-directory' into maint
"git mv dir non-existing-dir/" did not work in some environments the same way as existing mainstream platforms. The code now moves "dir" to "non-existing-dir", without relying on rename("A", "B/") that strips the trailing slash of '/'. * js/mv-dir-to-new-directory: git mv: do not keep slash in `git mv dir non-existing-dir/`
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions