]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7f349e baa37bf)
Merge branch 'dt/merge-recursive-case-insensitive'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:23:13 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:23:13 +0000 (11:23 -0700)
commit067fe6435534588bfd63857663532861d711d56e
treea60a6ba1b8fb6b65e380c17b721be6d6bdf03320tree | snapshot
parentf7f349e1383077fb9e1c03335a372b52a19ab2f0commit | diff
parentbaa37bff9a845471754d3f47957d58a6ccc30058commit | diff
Merge branch 'dt/merge-recursive-case-insensitive'

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
Unnamed repository; edit this file 'description' to name the repository.