From: Junio C Hamano Date: Thu, 14 Sep 2017 08:40:36 +0000 (+0900) Subject: Merge branch 'bb/doc-eol-dirty' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f0cb688c62e52f8a5ff3f1dfc660d22e30fab50?hp=169e9573a0f934a92c3e8f0aec925b78f916f008 Merge branch 'bb/doc-eol-dirty' into next Doc update. * bb/doc-eol-dirty: Documentation: mention that `eol` can change the dirty status of paths --- 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"::