mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 04:06:21 +02:00
Code

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>
This commit is contained in:
Ben Peart 2018-05-02 16:01:13 +00:00 committed by Junio C Hamano
parent 1de70dbd1a
commit a7152e9d22
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/diff-config.txt
View File

@ -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",

3
Documentation/merge-config.txt
View File

@ -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