aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-04-30 13:23:55 -0400
committerJunio C Hamano <gitster@pobox.com>2008-05-03 13:39:51 -0700
commit2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (patch)
tree823a7d5100be5218581c7eabec25ef2bd605f0e8 /diff.c
parentec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea (diff)
downloadgit-2a2ac926547bc4fa91fcd1cb741dd5691ba9b974.tar.gz
git-2a2ac926547bc4fa91fcd1cb741dd5691ba9b974.tar.xz
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>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions