| commit | df3a02f6125f7ac82b6e81e3e32cd7ca3c7905ee | |
| author | Lars Hjemli <hjemli@gmail.com> | |
| Tue, 25 Sep 2007 06:36:38 +0000 (25 08:36 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Sep 2007 00:35:16 +0000 (25 17:35 -0700) | ||
| tree | ed0ebdfc467b58656e36dd16e3d815cdb2fa5996 | treesnapshot (tar.gz zip) |
| parent | 2ecb5ea2ad375017eedf73bd0130fa9ca33010d2 | commitdiff |
Make merge-recursive honor diff.renamelimit
It might be a sign of source code management gone bad, but when two branches
has diverged almost beyond recognition and time has come for the branches to
merge, the user is going to need all the help his tool can give him. Honoring
diff.renamelimit has great potential as a painkiller in such situations.
The painkiller effect could have been achieved by e.g. 'merge.renamelimit',
but the flexibility gained by a separate option is questionable: our user
would probably expect git to detect renames equally good when merging as
when diffing (I known I did).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It might be a sign of source code management gone bad, but when two branches
has diverged almost beyond recognition and time has come for the branches to
merge, the user is going to need all the help his tool can give him. Honoring
diff.renamelimit has great potential as a painkiller in such situations.
The painkiller effect could have been achieved by e.g. 'merge.renamelimit',
but the flexibility gained by a separate option is questionable: our user
would probably expect git to detect renames equally good when merging as
when diffing (I known I did).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |