Autogenerated HTML docs for v1.8.2-rc0

1 files changed, 50 insertions, 0 deletions

diff --git a/git-diff-files.html b/git-diff-files.html
index 4cfe93496..b3b1dfcec 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -835,6 +835,56 @@ same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--diff-algorithm={patience|minimal|histogram|myers}

+</dt>

+<dd>

+<p>

+        Choose a diff algorithm. The variants are as follows:

+</p>

+<div class="openblock">

+<div class="content">

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<code>default</code>, <code>myers</code>

+</dt>

+<dd>

+<p>

+        The basic greedy diff algorithm. Currently, this is the default.

+</p>

+</dd>

+<dt class="hdlist1">

+<code>minimal</code>

+</dt>

+<dd>

+<p>

+        Spend extra time to make sure the smallest possible diff is

+        produced.

+</p>

+</dd>

+<dt class="hdlist1">

+<code>patience</code>

+</dt>

+<dd>

+<p>

+        Use "patience diff" algorithm when generating patches.

+</p>

+</dd>

+<dt class="hdlist1">

+<code>histogram</code>

+</dt>

+<dd>

+<p>

+        This algorithm extends the patience algorithm to "support

+        low-occurrence common elements".

+</p>

+</dd>

+</dl></div>

+</div></div>

+<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a

+non-default value and want to use the default one, then you

+have to use <code>--diff-algorithm=default</code> option.</p></div>

+</dd>

+<dt class="hdlist1">

 --stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]

 </dt>

 <dd>