Autogenerated HTML docs for v1.5.4.1-183-gf873

1 files changed, 31 insertions, 1 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 57ba80387..87d8a7c84 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -412,6 +412,36 @@ in to the repository.</p>
 <p>When <tt>core.autocrlf</tt> is set to "input", line endings are

 converted to LF upon checkin, but there is no conversion done

 upon checkout.</p>

+<p>If <tt>core.safecrlf</tt> is set to "true" or "warn", git verifies if

+the conversion is reversible for the current setting of

+<tt>core.autocrlf</tt>.  For "true", git rejects irreversible

+conversions; for "warn", git only prints a warning but accepts

+an irreversible conversion.  The safety triggers to prevent such

+a conversion done to the files in the work tree, but there are a

+few exceptions.  Even though&#8230;</p>

+<ul>

+<li>

+<p>

+"git add" itself does not touch the files in the work tree, the

+  next checkout would, so the safety triggers;

+</p>

+</li>

+<li>

+<p>

+"git apply" to update a text file with a patch does touch the files

+  in the work tree, but the operation is about text files and CRLF

+  conversion is about fixing the line ending inconsistencies, so the

+  safety does not trigger;

+</p>

+</li>

+<li>

+<p>

+"git diff" itself does not touch the files in the work tree, it is

+  often run to inspect the changes you intend to next "git add".  To

+  catch potential problems early, safety triggers.

+</p>

+</li>

+</ul>

 <h4><tt>ident</tt></h4>

 <p>When the attribute <tt>ident</tt> is set to a path, git replaces

 <tt>$Id$</tt> in the blob object with <tt>$Id:</tt>, followed by

@@ -787,7 +817,7 @@ commit hash.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 07-Jan-2008 07:50:59 UTC

+Last updated 17-Feb-2008 03:50:09 UTC

 </div>

 </div>

 </body>