diff options
| author | Jeff King <peff@peff.net> | 2008-04-30 17:23:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-03 20:39:51 (GMT) |
| commit | 2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (patch) | |
| tree | 823a7d5100be5218581c7eabec25ef2bd605f0e8 /Documentation/merge-config.txt | |
| parent | ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea (diff) | |
| download | git-2a2ac926547bc4fa91fcd1cb741dd5691ba9b974.zip git-2a2ac926547bc4fa91fcd1cb741dd5691ba9b974.tar.gz git-2a2ac926547bc4fa91fcd1cb741dd5691ba9b974.tar.bz2 | |
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 'Documentation/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9719311..48ce747 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -6,6 +6,11 @@ merge.log:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.renameLimit:: + The number of files to consider when performing rename detection + during a merge; if not specified, defaults to the value of + diff.renameLimit. + merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", |