git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed5d0d2 baa37bf)
Merge branch 'dt/merge-recursive-case-insensitive' into maint
authorJunio C Hamano <redacted>
Wed, 25 Jun 2014 18:48:34 +0000 (11:48 -0700)
committerJunio C Hamano <redacted>
Wed, 25 Jun 2014 18:48:34 +0000 (11:48 -0700)
commit5fa38cc3a47c197a352dc52a1b373162c84b8697
tree9e6fabd7e859f6c1d211cbd5050c1505cb340405tree | snapshot
parented5d0d2105c84ec40dd7526c9cd20e4587c62987commit | diff
parentbaa37bff9a845471754d3f47957d58a6ccc30058commit | diff
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
builtin/mv.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT