| commit | 5fa38cc3a47c197a352dc52a1b373162c84b8697 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:48:34 +0000 (25 11:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:48:34 +0000 (25 11:48 -0700) | ||
| tree | 9e6fabd7e859f6c1d211cbd5050c1505cb340405 | treesnapshot (tar.gz zip) |
| parent | ed5d0d2105c84ec40dd7526c9cd20e4587c62987 | commitdiff |
| parent | baa37bff9a845471754d3f47957d58a6ccc30058 | commitdiff |
Merge branch 'dt/merge-recursive-case-insensitive' into maint
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* dt/merge-recursive-case-insensitive:
mv: allow renaming to fix case on case insensitive filesystems
merge-recursive.c: fix case-changing merge bug
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* dt/merge-recursive-case-insensitive:
mv: allow renaming to fix case on case insensitive filesystems
merge-recursive.c: fix case-changing merge bug
| builtin/mv.c | diff1 | diff2 | blobhistory |