diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 13:57:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 13:57:54 -0800 |
commit | 047135e65db3686c7b168ba029e8545071e5226f (patch) | |
tree | 8cb85350a565679c88d6d642189594081b64a38b /git-diff-files.html | |
parent | 005a1130228687694cfc3f028b25b6eea05dbbb2 (diff) | |
download | git-htmldocs-047135e65db3686c7b168ba029e8545071e5226f.tar.gz |
Autogenerated HTML docs for v2.15.1-433-g936d1
Diffstat (limited to 'git-diff-files.html')
-rw-r--r-- | git-diff-files.html | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 4ffe34916..70c551e7d 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -865,6 +865,19 @@ same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div> </p>
</dd>
<dt class="hdlist1">
+--anchored=<text>
+</dt>
+<dd>
+<p>
+ Generate a diff using the "anchored diff" algorithm.
+</p>
+<div class="paragraph"><p>This option may be specified more than once.</p></div>
+<div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
+and starts with this text, this algorithm attempts to prevent it from
+appearing as a deletion or addition in the output. It uses the "patience
+diff" algorithm internally.</p></div>
+</dd>
+<dt class="hdlist1">
--diff-algorithm={patience|minimal|histogram|myers}
</dt>
<dd>
@@ -2429,7 +2442,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</ <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-21 00:40:27 JST
+Last updated 2013-08-20 08:40:27 PDT
</div>
</div>
</body>
|