]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 69d65bc ca4e3ca)
Merge branch 'sg/diff-multiple-identical-renames'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:32 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:32 +0000 (14:12 -0700)
commit26effb8487386e431990905d4eba7e81f1018eda
treec0d17729b7454c9b999b82f968ba27c84561d612tree | snapshot
parent69d65bc7a38bd01049d8baa5efef7331ab9c71d2commit | diff
parentca4e3ca029def86b7b29451d4ba77ef76574949ecommit | diff
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
diffcore-rename.c diff1 | diff2 | blob | history
t/t4001-diff-rename.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.