merge: update documentation for {merge,diff}.renameLimit
Update the documentation to better indicate that the renameLimit setting is ignored if rename detection is turned off via command line options or config settings. Signed-off-by: Ben Peart <benpeart@microsoft.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ben Peart committed
May 2, 2018 at 16:01 UTC
a7152e9d226652e6ceaa64f099fc628aa2a909bd
2 files changed
+4
-2
Documentation/diff-config.txt
+2
-1
@@ -112,7 +112,8 @@ diff.orderFile::
112
113
diff.renameLimit::
114
The number of files to consider when performing the copy/rename
115
- detection; equivalent to the 'git diff' option `-l`.
115
+ detection; equivalent to the 'git diff' option `-l`. This setting
116
+ has no effect if rename detection is turned off.
117
118
diff.renames::
119
Whether and how Git detects renames. If set to "false",
Documentation/merge-config.txt
+2
-1
@@ -35,7 +35,8 @@ include::fmt-merge-msg-config.txt[]
35
merge.renameLimit::
36
The number of files to consider when performing rename detection
37
during a merge; if not specified, defaults to the value of
38
- diff.renameLimit.
38
+ diff.renameLimit. This setting has no effect if rename detection
39
+ is turned off.
40
41
merge.renormalize::
42
Tell Git that canonical representation of files in the