diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-01-26 06:36:02 +0000 |
| commit | 20d47e3f1442b9a7384b08ea40846c078f227a47 (patch) | |
| tree | 0e2eafa5965e7d5044b5b7d3c6e5e16430b4865f /git-diff.html | |
| parent | 22bcc112adfbdb908fb26cbdb2a89b0db95652a4 (diff) | |
| download | git-htmldocs-20d47e3f1442b9a7384b08ea40846c078f227a47.tar.gz | |
Autogenerated HTML docs for v1.6.1.1-223-gc30e5
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/git-diff.html b/git-diff.html index d289c5087..3a368941a 100644 --- a/git-diff.html +++ b/git-diff.html @@ -453,10 +453,14 @@ and the range notations ("<commit>..<commit>" and 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>
@@ -573,12 +577,24 @@ and the range notations ("<commit>..<commit>" and </p>
</dd>
<dt>
---color-words
+--color-words[=<regex>]
</dt>
<dd>
<p>
- Show colored word diff, i.e. color words which have changed.
-</p>
+ 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 <regex> is specified, every non-overlapping match of the
+<regex> 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
@@ -1585,7 +1601,7 @@ Output diff in reverse. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-01-24 08:04:58 UTC
+Last updated 2009-01-26 06:35:37 UTC
</div>
</div>
</body>
|