]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 11f944d) | patch
diffcore-rename: properly honor the difference between -M and -C
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Feb 2011 04:10:32 +0000 (20:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Feb 2011 06:26:28 +0000 (22:26 -0800)
commit0940e5f211452ec2520d1b04233acddf0a872c06
tree7e9dc2f563330f4dc410d91da80cc1e6b845406dtree | snapshot
parent11f944dd6bdabd003325c85dc60b16389d012361commit | diff
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>
diffcore-rename.c diff | blob | blame | history
t/t4003-diff-rename-1.sh diff | blob | blame | history
t/t4004-diff-rename-symlink.sh diff | blob | blame | history
t/t4005-diff-rename-2.sh diff | blob | blame | history
t/t4008-diff-break-rewrite.sh diff | blob | blame | history
t/t4009-diff-rename-4.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.