From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2019 07:16:24 +0000 (+0900)
Subject: Merge branch 'yb/utf-16le-bom-spellfix'
X-Git-Tag: v2.22.0-rc0~155
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cab2886944e4c0c2b8e2d76639bb145743ecc76?ds=inline;hp=-c

Merge branch 'yb/utf-16le-bom-spellfix'

Doc update.

* yb/utf-16le-bom-spellfix:
gitattributes.txt: fix typo
---

2cab2886944e4c0c2b8e2d76639bb145743ecc76
diff --combined Documentation/gitattributes.txt
index 9b41f81c06,4b4f04429e..bdd11a2ddd
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -124,9 -124,7 +124,9 @@@ text file is normalized, its line endin
  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::
  
@@@ -346,7 -344,7 +346,7 @@@ automatic line ending conversion based 
  
  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`