From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:23 +0000 (-0800)
Subject: Merge branch 'jk/autocrlf-overrides-eol-doc'
X-Git-Tag: v2.21.0-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/13e263095b55c88b7af86c3c88f8b0f937eb4d5c?ds=inline;hp=-c

Merge branch 'jk/autocrlf-overrides-eol-doc'

Documentation around core.crlf has been updated.

* jk/autocrlf-overrides-eol-doc:
docs/config: clarify "text property" in core.eol
doc/gitattributes: clarify "autocrlf overrides eol"
---

13e263095b55c88b7af86c3c88f8b0f937eb4d5c
diff --combined Documentation/gitattributes.txt
index a2310fb920,ce383e97dc..9b41f81c06
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -124,7 -124,9 +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::
  
@@@ -344,9 -346,7 +346,9 @@@ 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. 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.