| commit | 0940e5f211452ec2520d1b04233acddf0a872c06 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 19 Feb 2011 04:10:32 +0000 (18 20:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 19 Feb 2011 06:26:28 +0000 (18 22:26 -0800) | ||
| tree | 7e9dc2f563330f4dc410d91da80cc1e6b845406d | treesnapshot (tar.gz zip) |
| parent | 11f944dd6bdabd003325c85dc60b16389d012361 | commitdiff |
diffcore-rename: properly honor the difference between -M and -C
We would allow rename detection to do copy detection even when asked
purely for renames. That confuses users, but more importantly it can
terminally confuse the recursive merge rename logic.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We would allow rename detection to do copy detection even when asked
purely for renames. That confuses users, but more importantly it can
terminally confuse the recursive merge rename logic.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>