diff options
| author | Elijah Newren <newren@gmail.com> | 2021-07-15 03:45:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 02:54:24 +0300 |
| commit | 6623a528e00b73f5438724a355c43343d3de8652 (patch) | |
| tree | 0300e94752ae6a10bb159d5c16bdbe7bbb7db968 /Documentation/config/merge.txt | |
| parent | 05d2c61c6744212cdef6085832a84b49da77591c (diff) | |
doc: clarify documentation for rename/copy limits
A few places in the docs implied that rename/copy detection is always
quadratic or that all (unpaired) files were involved in the quadratic
portion of rename/copy detection. The following two commits each
introduced an exception to this:
9027f53cb505 (Do linear-time/space rename logic for exact renames,
2007-10-25)
bd24aa2f97a0 (diffcore-rename: guide inexact rename detection based
on basenames, 2021-02-14)
(As a side note, for copy detection, the basename guided inexact rename
detection is turned off and the exact renames will only result in
sources (without the dests) being removed from the set of files used in
quadratic detection. So, for copy detection, the documentation was
closer to correct.)
Avoid implying that all files involved in rename/copy detection are
subject to the full quadratic algorithm. While at it, also note the
default values for all these settings.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/merge.txt')
| -rw-r--r-- | Documentation/config/merge.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt index 6b66c83eab..7cd6d7883b 100644 --- a/Documentation/config/merge.txt +++ b/Documentation/config/merge.txt @@ -33,10 +33,12 @@ merge.verifySignatures:: include::fmt-merge-msg.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. This setting has no effect if rename detection - is turned off. + The number of files to consider in the exhaustive portion of + rename detection during a merge. If not specified, defaults + to the value of diff.renameLimit. If neither + merge.renameLimit nor diff.renameLimit are specified, + currently defaults to 1000. This setting has no effect if + rename detection is turned off. merge.renames:: Whether Git detects renames. If set to "false", rename detection |