Autogenerated HTML docs for v2.9.2-466-g8c6d1

1 files changed, 12 insertions, 9 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 791991ce1..a703e0387 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -862,7 +862,8 @@ repository upon <em>git add</em> and <em>git commit</em>.</p></div>
 text file is normalized, its line endings are converted to LF in the

 repository.  To control what line ending style is used in the working

 directory, use the <code>eol</code> attribute for a single file and the

-<code>core.eol</code> configuration variable for all text files.</p></div>

+<code>core.eol</code> configuration variable for all text files.

+Note that <code>core.autocrlf</code> overrides <code>core.eol</code></p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 Set

@@ -889,8 +890,9 @@ Set to string value "auto"
 <dd>

 <p>

         When <code>text</code> is set to "auto", the path is marked for automatic

-        end-of-line normalization.  If Git decides that the content is

-        text, its line endings are normalized to LF on checkin.

+        end-of-line conversion.  If Git decides that the content is

+        text, its line endings are converted to LF on checkin.

+        When the file has been commited with CRLF, no conversion is done.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -910,7 +912,7 @@ unspecified.</p></div>
 <div class="sect3">

 <h4 id="_code_eol_code"><code>eol</code></h4>

 <div class="paragraph"><p>This attribute sets a specific line-ending style to be used in the

-working directory.  It enables end-of-line normalization without any

+working directory.  It enables end-of-line conversion without any

 content checks, effectively setting the <code>text</code> attribute.</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

@@ -957,9 +959,10 @@ the working directory, and prevent .jpg files from being normalized
 regardless of their content.</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>*.txt           text

-*.vcproj        eol=crlf

-*.sh            eol=lf

+<pre><code>*               text=auto

+*.txt           text

+*.vcproj        text eol=crlf

+*.sh            text eol=lf

 *.jpg           -text</code></pre>

 </div></div>

 <div class="paragraph"><p>Other source code management systems normalize all text files in their

@@ -967,7 +970,7 @@ repositories, and there are two ways to enable similar automatic
 normalization in Git.</p></div>

 <div class="paragraph"><p>If you simply want to have CRLF line endings in your working directory

 regardless of the repository you are working with, you can set the

-config variable "core.autocrlf" without changing any attributes.</p></div>

+config variable "core.autocrlf" without using any attributes.</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>[core]

@@ -1867,7 +1870,7 @@ frotz   unspecified</code></pre>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2016-06-20 14:23:22 PDT

+Last updated 2016-07-25 15:49:08 PDT

 </div>

 </div>

 </body>