summaryrefslogtreecommitdiffstats
path: root/gitdiffcore.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-22 14:20:26 -0700
committerJunio C Hamano <gitster@pobox.com>2021-03-22 14:20:26 -0700
commit458281a5cc4fbbf5382b507870ac92d09f4cb1d9 (patch)
treef969cc3e9470c06902051bcd159aa1bc58a02bb2 /gitdiffcore.html
parentd6b9ba3262e9125b842efd226c8023a5c9aed98c (diff)
downloadgit-htmldocs-458281a5cc4fbbf5382b507870ac92d09f4cb1d9.tar.gz
Autogenerated HTML docs for v2.31.0-97-g14243
Diffstat (limited to 'gitdiffcore.html')
-rw-r--r--gitdiffcore.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitdiffcore.html b/gitdiffcore.html
index bfb02082e..0f83ea59e 100644
--- a/gitdiffcore.html
+++ b/gitdiffcore.html
@@ -954,7 +954,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.</p></div>
+preliminary step may be skipped for those files.</p></div>
<div class="paragraph"><p>Note. When the "-C" option is used with <code>--find-copies-harder</code>
option, <em>git diff-&#42;</em> commands feed unmodified filepairs to
diffcore mechanism as well as modified ones. This lets the copy
@@ -1108,7 +1108,7 @@ not sorted when diffcore-order is in effect.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-03-02 23:05:01 PST
+ 2021-03-22 14:17:33 PDT
</div>
</div>
</body>