| commit | b96c396cce05c9559f335d5ed6856687036e01ba | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2016 21:15:55 +0000 (29 14:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 Apr 2016 21:15:55 +0000 (29 14:15 -0700) | ||
| tree | dad57c5104b24d24e2d42c9a161af46cd5e408ed | treesnapshot (tar.gz zip) |
| parent | 3bb56a91be7d136f5f03902ea900185e01a2cdcb | commitdiff |
| parent | ca4e3ca029def86b7b29451d4ba77ef76574949e | commitdiff |
Merge branch 'sg/diff-multiple-identical-renames' into maint
"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
"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
| diffcore-rename.c | diff1 | diff2 | blobhistory |