X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=9b41f81c06ef9fd2386b0e424d4d62cb27195ae3;hb=13e263095b55c88b7af86c3c88f8b0f937eb4d5c;hp=b8392fc3300cfa7d7c37e37dd069246f20ceadb1;hpb=9fc9555312ea90d4e80cee17478f1d12ec976d19;p=thirdparty%2Fgit.git

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index b8392fc330..9b41f81c06 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -124,7 +124,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 `eol` attribute for a single file and the
 `core.eol` configuration variable for all text files.
-Note that `core.autocrlf` overrides `core.eol`
+Note that setting `core.autocrlf` to `true` or `input` overrides
+`core.eol` (see the definitions of those options in
+linkgit:git-config[1]).
 
 Set::
 
@@ -344,7 +346,9 @@ automatic line ending conversion based on your platform.
 
 Use the following attributes if your '*.ps1' 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 `UTF-16-LE-BOM` instead of `UTF-16LE` if
+you want UTF-16 little endian with BOM).
+Please note, it is highly recommended to
 explicitly define the line endings with `eol` if the `working-tree-encoding`
 attribute is used to avoid ambiguity.