| commit | 26effb8487386e431990905d4eba7e81f1018eda | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:32 +0000 (13 14:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:32 +0000 (13 14:12 -0700) | ||
| tree | c0d17729b7454c9b999b82f968ba27c84561d612 | treesnapshot (tar.gz zip) |
| parent | 69d65bc7a38bd01049d8baa5efef7331ab9c71d2 | commitdiff |
| parent | ca4e3ca029def86b7b29451d4ba77ef76574949e | commitdiff |
Merge branch 'sg/diff-multiple-identical-renames'
"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 |
| t/t4001-diff-rename.sh | diff1 | diff2 | blobhistory |