Autogenerated HTML docs for v1.6.1.1-223-gc30e5

1 files changed, 23 insertions, 7 deletions

diff --git a/git-format-patch.html b/git-format-patch.html
index 817a2d4d9..06f5ff370 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -422,10 +422,14 @@ reference.</p></div>
         Synonym for "-p --raw".

 </p>

 </dd>

-</dl></div>

-<div class="para"><p>--patience:

-        Generate a diff using the "patience diff" algorithm.</p></div>

-<div class="vlist"><dl>

+<dt>

+--patience

+</dt>

+<dd>

+<p>

+        Generate a diff using the "patience diff" algorithm.

+</p>

+</dd>

 <dt>

 --stat[=width[,name-width]]

 </dt>

@@ -542,12 +546,24 @@ reference.</p></div>
 </p>

 </dd>

 <dt>

---color-words

+--color-words[=&lt;regex&gt;]

 </dt>

 <dd>

 <p>

-        Show colored word diff, i.e. color words which have changed.

+        Show colored word diff, i.e., color words which have changed.

+        By default, words are separated by whitespace.

 </p>

+<div class="para"><p>When a &lt;regex&gt; is specified, every non-overlapping match of the

+&lt;regex&gt; is considered a word.  Anything between these matches is

+considered whitespace and ignored(!) for the purposes of finding

+differences.  You may want to append <tt>|[^[:space:]]</tt> to your regular

+expression to make sure that it matches all non-whitespace characters.

+A match that contains a newline is silently truncated(!) at the

+newline.</p></div>

+<div class="para"><p>The regex can also be set via a diff driver or configuration option, see

+<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>.  Giving it explicitly

+overrides any diff driver or configuration setting.  Diff drivers

+override configuration settings.</p></div>

 </dd>

 <dt>

 --no-renames

@@ -1147,7 +1163,7 @@ as e-mailable patches:
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-01-24 08:04:59 UTC

+Last updated 2009-01-26 06:35:38 UTC

 </div>

 </div>

 </body>