summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-02-07 07:05:21 +0100
committerJunio C Hamano <gitster@pobox.com>2019-02-07 07:05:21 +0100
commit0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83 (patch)
treeace8383345c2e54c9aea265f06e3612438351007 /Documentation
parentMerge branch 'dt/cat-file-batch-ambiguous' (diff)
parentSupport working-tree-encoding "UTF-16LE-BOM" (diff)
downloadgit-0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83.tar.xz
git-0fa3cc77ee9fb3b6bb53c73688c9b7500f996b83.zip
Merge branch 'tb/utf-16-le-with-explicit-bom'
A new encoding UTF-16LE-BOM has been invented to force encoding to UTF-16 with BOM in little endian byte order, which cannot be directly generated by using iconv. * tb/utf-16-le-with-explicit-bom: Support working-tree-encoding "UTF-16LE-BOM"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index b8392fc330..a2310fb920 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -344,7 +344,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.