| commit | c9bd6d33ed10489821ba2a3f2299aeac2613521b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 18:33:00 +0000 (25 10:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 18:33:00 +0000 (25 10:33 -0800) | ||
| tree | f811959669855c53db2c486db81ccb62fca4148d | treesnapshot (tar.gz zip) |
| parent | c37541c384be303994b1e024d19d7961f72850c7 | commitdiff |
| parent | d020e27fdaeb7d04247cdf5a0ff84d97626d5f5a | commitdiff |
Merge branch 'ap/maint-diff-rename-avoid-overlap' into next
The logic used by "git diff -M --stat" to shorten the names of
files before and after a rename did not work correctly when the
common prefix and suffix between the two filenames overlapped.
* ap/maint-diff-rename-avoid-overlap:
diff: Fix rename pretty-print when suffix and prefix overlap
The logic used by "git diff -M --stat" to shorten the names of
files before and after a rename did not work correctly when the
common prefix and suffix between the two filenames overlapped.
* ap/maint-diff-rename-avoid-overlap:
diff: Fix rename pretty-print when suffix and prefix overlap
| diff.c | diff1 | diff2 | blobhistory |