]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bb56a9 ca4e3ca)
Merge branch 'sg/diff-multiple-identical-renames' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:15:55 +0000 (14:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:15:55 +0000 (14:15 -0700)
"git diff -M" used to work better when two originally identical
files A and B got renamed to X/A and X/B by pairing A to X/A and B
to X/B, but this was broken in the 2.0 timeframe.

* sg/diff-multiple-identical-renames:
  diffcore: fix iteration order of identical files during rename detection

1  2 
diffcore-rename.c patch | diff1 | diff2 | blob | history

diff --cc diffcore-rename.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.