Autogenerated HTML docs for v1.5.3.7-1141-g4eb3

1 files changed, 44 insertions, 1 deletions

diff --git a/gitattributes.html b/gitattributes.html
index c5061f0c1..488ddc3ba 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -629,6 +629,49 @@ driver to use when the merge driver is called for an internal
 merge between common ancestors, when there are more than one.

 When left unspecified, the driver itself is used for both

 internal merge and the final merge.</p>

+<h3>Checking whitespace errors</h3>

+<h4><tt>whitespace</tt></h4>

+<p>The <tt>core.whitespace</tt> configuration variable allows you to define what

+<tt>diff</tt> and <tt>apply</tt> should consider whitespace errors for all paths in

+the project (See <a href="git-config.html">git-config(1)</a>).  This attribute gives you finer

+control per path.</p>

+<dl>

+<dt>

+Set

+</dt>

+<dd>

+<p>

+        Notice all types of potential whitespace errors known to git.

+</p>

+</dd>

+<dt>

+Unset

+</dt>

+<dd>

+<p>

+        Do not notice anything as error.

+</p>

+</dd>

+<dt>

+Unspecified

+</dt>

+<dd>

+<p>

+        Use the value of <tt>core.whitespace</tt> configuration variable to

+        decide what to notice as error.

+</p>

+</dd>

+<dt>

+String

+</dt>

+<dd>

+<p>

+        Specify a comma separate list of common whitespace problems to

+        notice in the same format as <tt>core.whitespace</tt> configuration

+        variable.

+</p>

+</dd>

+</dl>

 </div>

 <h2>EXAMPLE</h2>

 <div class="sectionbody">

@@ -703,7 +746,7 @@ commit hash.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 14-Nov-2007 12:11:57 UTC

+Last updated 09-Dec-2007 10:19:08 UTC

 </div>

 </div>

 </body>