summaryrefslogtreecommitdiff
path: root/csum-file.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 20:10:32 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-18 22:26:28 -0800
commit0940e5f211452ec2520d1b04233acddf0a872c06 (patch)
tree7e9dc2f563330f4dc410d91da80cc1e6b845406d /csum-file.h
parent11f944dd6bdabd003325c85dc60b16389d012361 (diff)
downloadgit-0940e5f211452ec2520d1b04233acddf0a872c06.tar.gz
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>
Diffstat (limited to 'csum-file.h')
0 files changed, 0 insertions, 0 deletions