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.html | |
| parent | 005a1130228687694cfc3f028b25b6eea05dbbb2 (diff) | |
| download | git-htmldocs-047135e65db3686c7b168ba029e8545071e5226f.tar.gz | |
Autogenerated HTML docs for v2.15.1-433-g936d1
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/git-diff.html b/git-diff.html index c145525d8..2f6cfaffe 100644 --- a/git-diff.html +++ b/git-diff.html @@ -973,6 +973,19 @@ and the range notations ("<commit>..<commit>" and </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>
@@ -2696,7 +2709,7 @@ Output diff in reverse. <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-04-20 14:32:42 JST
+Last updated 2017-04-19 22:32:42 PDT
</div>
</div>
</body>
|