diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 05:19:09 (GMT) |
| commit | 28a925bc515c3672a46739434aefb78593ee6883 (patch) | |
| tree | 0d3e27759b07db5ae4550d6a5b507b24d1beee01 /Documentation | |
| parent | 0445bd7b556283339bb4f07d11114ff8e50515af (diff) | |
| parent | 3bc4b8f7c757059bb845b5074691362cece91c70 (diff) | |
| download | git-28a925bc515c3672a46739434aefb78593ee6883.zip git-28a925bc515c3672a46739434aefb78593ee6883.tar.gz git-28a925bc515c3672a46739434aefb78593ee6883.tar.bz2 | |
Merge branch 'bb/doc-eol-dirty' into maint
Doc update.
* bb/doc-eol-dirty:
Documentation: mention that `eol` can change the dirty status of paths
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index c4f2be2..4c68bc1 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -151,7 +151,10 @@ unspecified. This attribute sets a specific line-ending style to be used in the working directory. It enables end-of-line conversion without any -content checks, effectively setting the `text` attribute. +content checks, effectively setting the `text` attribute. 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. Set to string value "crlf":: |