Autogenerated HTML docs for v1.6.1.1-223-gc30e5

1 files changed, 20 insertions, 1 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 8eaf8be65..fa3adbd70 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -642,6 +642,11 @@ patterns are available:</p></div>
 </li>

 <li>

 <p>

+<tt>cpp</tt> suitable for source code in the C and C++ languages.

+</p>

+</li>

+<li>

+<p>

 <tt>html</tt> suitable for HTML/XHTML documents.

 </p>

 </li>

@@ -681,6 +686,20 @@ patterns are available:</p></div>
 </p>

 </li>

 </ul></div>

+<h4 id="_customizing_word_diff">Customizing word diff</h4>

+<div class="para"><p>You can customize the rules that <tt>git diff --color-words</tt> uses to

+split words in a line, by specifying an appropriate regular expression

+in the "diff.*.wordRegex" configuration variable.  For example, in TeX

+a backslash followed by a sequence of letters forms a command, but

+several such commands can be run together without intervening

+whitespace.  To separate them, use a regular expression such as</p></div>

+<div class="listingblock">

+<div class="content">

+<pre><tt>[diff "tex"]

+        wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"</tt></pre>

+</div></div>

+<div class="para"><p>A built-in pattern is provided for all languages listed in the

+previous section.</p></div>

 <h4 id="_performing_text_diffs_of_binary_files">Performing text diffs of binary files</h4>

 <div class="para"><p>Sometimes it is desirable to see the diff of a text-converted

 version of some binary files. For example, a word processor

@@ -1000,7 +1019,7 @@ frotz   unspecified</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-12-10 08:33:31 UTC

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

 </div>

 </div>

 </body>