diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-11 16:16:24 +0900 |
| commit | 2cab2886944e4c0c2b8e2d76639bb145743ecc76 (patch) | |
| tree | d0839983037480aeca8620c4961d01b2a3a67558 | |
| parent | mingw: drop MakeMaker reference (diff) | |
| parent | gitattributes.txt: fix typo (diff) | |
| download | tgif-2cab2886944e4c0c2b8e2d76639bb145743ecc76.tar.xz | |
Merge branch 'yb/utf-16le-bom-spellfix'
Doc update.
* yb/utf-16le-bom-spellfix:
gitattributes.txt: fix typo
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 9b41f81c06..bdd11a2ddd 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -346,7 +346,7 @@ 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 (use `UTF-16-LE-BOM` instead of `UTF-16LE` if +in the working directory (use `UTF-16LE-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` |