Autogenerated HTML docs for v2.21.0-rc0

1 files changed, 7 insertions, 3 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 2cc909842..efa903edf 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -880,7 +880,9 @@ 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.

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

+Note that setting <code>core.autocrlf</code> to <code>true</code> or <code>input</code> overrides

+<code>core.eol</code> (see the definitions of those options in

+<a href="git-config.html">git-config(1)</a>).</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 Set

@@ -1135,7 +1137,9 @@ automatic line ending conversion based on your platform.</p></div>
 </div></div>

 <div class="paragraph"><p>Use the following attributes if your <em>*.ps1</em> files are UTF-16 little

 endian encoded without BOM and you want Git to use Windows line endings

-in the working directory. Please note, it is highly recommended to

+in the working directory (use <code>UTF-16-LE-BOM</code> instead of <code>UTF-16LE</code> if

+you want UTF-16 little endian with BOM).

+Please note, it is highly recommended to

 explicitly define the line endings with <code>eol</code> if the <code>working-tree-encoding</code>

 attribute is used to avoid ambiguity.</p></div>

 <div class="listingblock">

@@ -2150,7 +2154,7 @@ frotz   unspecified</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-10-30 00:33:48 PDT

+ 2019-02-06 23:17:45 PST

 </div>

 </div>

 </body>