diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-23 16:58:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-23 16:58:04 -0800 |
| commit | 66633f25c620bc622663a484c34e817b6cd97764 (patch) | |
| tree | 4a99d31ced8e3bfe05ac875c8ef015c052b63bf4 | |
| parent | Merge branch 'ds/mailmap' (diff) | |
| parent | doc: clarify interaction between 'eol' and text=auto (diff) | |
| download | tgif-66633f25c620bc622663a484c34e817b6cd97764.tar.xz | |
Merge branch 'bc/clarify-eol-attr'
Documentation update
* bc/clarify-eol-attr:
doc: clarify interaction between 'eol' and text=auto
| -rw-r--r-- | Documentation/gitattributes.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 60984a4682..a71dad2674 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -161,11 +161,12 @@ unspecified. This attribute sets a specific line-ending style to be used in the working directory. This attribute has effect only if the `text` -attribute is set or unspecified, or if it is set to `auto` and the file -is detected as text. Note that setting this attribute on paths which -are in the index with CRLF line endings may make the paths to be -considered dirty. Adding the path to the index again will normalize the -line endings in the index. +attribute is set or unspecified, or if it is set to `auto`, the file is +detected as text, and it is stored with LF endings in the index. Note +that setting this attribute on paths which are in the index with CRLF +line endings may make the paths to be considered dirty unless +`text=auto` is set. Adding the path to the index again will normalize +the line endings in the index. Set to string value "crlf":: |