summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-03-22 14:00:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-22 14:00:24 -0700
commitdd4048d1c76f067ad7b339dfb3a5f4765f5ae979 (patch)
treeeadb32eaf2d919c8f310f36d480ba3755775af8a /Documentation
parentMerge branch 'ab/grep-pcre2-allocfix' (diff)
parentdiffcore-rename: compute dir_rename_guess from dir_rename_counts (diff)
downloadtgif-dd4048d1c76f067ad7b339dfb3a5f4765f5ae979.tar.xz
Merge branch 'en/ort-perf-batch-8'
Rename detection rework continues. * en/ort-perf-batch-8: diffcore-rename: compute dir_rename_guess from dir_rename_counts diffcore-rename: limit dir_rename_counts computation to relevant dirs diffcore-rename: compute dir_rename_counts in stages diffcore-rename: extend cleanup_dir_rename_info() diffcore-rename: move dir_rename_counts into dir_rename_info struct diffcore-rename: add function for clearing dir_rename_count Move computation of dir_rename_count from merge-ort to diffcore-rename diffcore-rename: add a mapping of destination names to their indices diffcore-rename: provide basic implementation of idx_possible_rename() diffcore-rename: use directory rename guided basename comparisons
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitdiffcore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 1c7269655f..0d57f86abc 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -187,7 +187,7 @@ mark a file pair as a rename and stop considering other candidates for
better matches. At most, one comparison is done per file in this
preliminary pass; so if there are several remaining ext.txt files
throughout the directory hierarchy after exact rename detection, this
-preliminary step will be skipped for those files.
+preliminary step may be skipped for those files.
Note. When the "-C" option is used with `--find-copies-harder`
option, 'git diff-{asterisk}' commands feed unmodified filepairs to