| commit | 19d70bf751be473113fe31de58a39a22a45b676b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Feb 2013 21:54:26 +0000 (26 13:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Feb 2013 21:54:27 +0000 (26 13:54 -0800) | ||
| tree | 4a5be4b9edd7beb18ff4a3dbb955730450472944 | treesnapshot (tar.gz zip) |
| parent | c9cc7895c5963045223be8e5e4fdfef097dff936 | commitdiff |
| parent | dd281f09b7eab86e4983b37d011cbfb0f593f6b8 | 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.
Will cook in '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.
Will cook in 'next'.
| diff.c | diff1 | diff2 | blobhistory |