summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorBen Peart <Ben.Peart@microsoft.com>2018-05-02 16:01:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-08 07:19:41 (GMT)
commita7152e9d226652e6ceaa64f099fc628aa2a909bd (patch)
tree69dcb177e115ae89d2f47c8c15ea0a4dfde27f68 /Documentation
parent1de70dbd1ada0069d1b6cd6345323906cc9a9ed3 (diff)
downloadgit-a7152e9d226652e6ceaa64f099fc628aa2a909bd.zip
git-a7152e9d226652e6ceaa64f099fc628aa2a909bd.tar.gz
git-a7152e9d226652e6ceaa64f099fc628aa2a909bd.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-config.txt3
-rw-r--r--Documentation/merge-config.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 5ca942a..77caa66 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -112,7 +112,8 @@ diff.orderFile::
diff.renameLimit::
The number of files to consider when performing the copy/rename
- detection; equivalent to the 'git diff' option `-l`.
+ detection; equivalent to the 'git diff' option `-l`. This setting
+ has no effect if rename detection is turned off.
diff.renames::
Whether and how Git detects renames. If set to "false",
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 12b6bbf..48ee3bc 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -35,7 +35,8 @@ include::fmt-merge-msg-config.txt[]
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.
+ diff.renameLimit. This setting has no effect if rename detection
+ is turned off.
merge.renormalize::
Tell Git that canonical representation of files in the