| commit | 2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 | |
| author | Jeff King <peff@peff.net> | |
| Wed, 30 Apr 2008 17:23:55 +0000 (30 13:23 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 May 2008 20:39:51 +0000 (3 13:39 -0700) | ||
| tree | 823a7d5100be5218581c7eabec25ef2bd605f0e8 | treesnapshot (tar.gz zip) |
| parent | ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea | commitdiff |
add merge.renamelimit config option
The point of rename limiting is to bound the amount of time
we spend figuring out inexact renames. Currently we use a
single value, diff.renamelimit, for all situations. However,
it is probably the case that a user is willing to spend more
time finding renames during a merge than they are while
looking at git-log.
This patch provides a way of setting those values separately
(though for backwards compatibility, merge still falls back
on the diff renamelimit).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The point of rename limiting is to bound the amount of time
we spend figuring out inexact renames. Currently we use a
single value, diff.renamelimit, for all situations. However,
it is probably the case that a user is willing to spend more
time finding renames during a merge than they are while
looking at git-log.
This patch provides a way of setting those values separately
(though for backwards compatibility, merge still falls back
on the diff renamelimit).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-config.txt | diffblobblamehistory | |
| builtin-merge-recursive.c | diffblobblamehistory | |
| t/t6032-merge-large-rename.sh | [new file with mode: 0755] | blob |