diff options
| author |  Jeff King <peff@peff.net> | 2008-04-30 13:23:55 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:39:51 -0700 |
| commit | 2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (patch) | |
| tree | 823a7d5100be5218581c7eabec25ef2bd605f0e8 /t/t4013/diff.format-patch_--stdout_initial..master^ | |
| parent | Merge commit 'sg/merge-options^' into jk/renamelimit (diff) | |
| download | tgif-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 't/t4013/diff.format-patch_--stdout_initial..master^')
0 files changed, 0 insertions, 0 deletions