path: root/Documentation/merge-config.txt
diff options
authorJeff King <>2008-04-30 17:23:55 (GMT)
committerJunio C Hamano <>2008-05-03 20:39:51 (GMT)
commit2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (patch)
tree823a7d5100be5218581c7eabec25ef2bd605f0e8 /Documentation/merge-config.txt
parentec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/merge-config.txt')
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.
+ The number of files to consider when performing rename detection
+ during a merge; if not specified, defaults to the value of
+ diff.renameLimit.
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",