summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-07-15 00:45:21 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-15 16:54:24 -0700
commit05d2c61c6744212cdef6085832a84b49da77591c (patch)
treefad96c2b7995af33cf092e77ad8a4252ec96f3a5 /Documentation/config/merge.txt
parentThe third batch (diff)
downloadtgif-05d2c61c6744212cdef6085832a84b49da77591c.tar.xz
diff: correct warning message when renameLimit exceeded
The warning when quadratic rename detection was skipped referred to "inexact rename detection". For years, the only linear portion of rename detection was looking for exact renames, so "inexact rename detection" was an accurate way to refer to the quadratic portion of rename detection. However, that changed with commit bd24aa2f97a0 (diffcore-rename: guide inexact rename detection based on basenames, 2021-02-14). Let's instead use the term "exhaustive rename detection" to refer to the quadratic portion. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/merge.txt')
0 files changed, 0 insertions, 0 deletions