summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar David Turner <dturner@twitter.com>2014-05-08 10:23:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-08 14:34:00 -0700
commitbaa37bff9a845471754d3f47957d58a6ccc30058 (patch)
tree7c325075844e18a2eac8e1059694d3f0be403dd8 /git-mergetool--lib.sh
parentmerge-recursive.c: fix case-changing merge bug (diff)
downloadtgif-baa37bff9a845471754d3f47957d58a6ccc30058.tar.xz
mv: allow renaming to fix case on case insensitive filesystems
"git mv hello.txt Hello.txt" on a case insensitive filesystem always triggers "destination already exists" error, because these two names refer to the same path from the filesystem's point of view, and requires the user to give "--force" when correcting the case of the path recorded in the index and in the next commit. Detect this case and allow it without requiring "--force". Signed-off-by: David Turner <dturner@twitter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions