diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 10:47:54 +0900 |
| commit | 0517ae0ba6a69c5c11cb8660c3d491f525cba09c (patch) | |
| tree | f7af1195bd56701532ad03c33d2b4327c509ad35 /Documentation/gitattributes.txt | |
| parent | Merge branch 'jt/packmigrate' (diff) | |
| parent | Documentation: mention that `eol` can change the dirty status of paths (diff) | |
| download | tgif-0517ae0ba6a69c5c11cb8660c3d491f525cba09c.tar.xz | |
Merge branch 'bb/doc-eol-dirty'
Doc update.
* bb/doc-eol-dirty:
Documentation: mention that `eol` can change the dirty status of paths
Diffstat (limited to 'Documentation/gitattributes.txt')
| -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 c4f2be2542..4c68bc19d5 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":: |