Torsten Bögershausen <tboegi@xxxxxx> writes: >> ---- >8 ----- >> From: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> >> Subject: doc: clarify interaction between 'eol' and text=auto >> >> The `eol` takes effect on text files only when the index has the >> contents in LF line endings. Paths with contents in CRLF line >> endings in the index may become dirty unless text=auto. > > That is a nice, precise and short summary here in the commit message > as well as the patch further down. Thanks. Then let's queue it for 'next' and merge it down. >> >> Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> >> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> >> --- >> Documentation/gitattributes.txt | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) >> >> diff --git c/Documentation/gitattributes.txt w/Documentation/gitattributes.txt >> index 60984a4682..a71dad2674 100644 >> --- c/Documentation/gitattributes.txt >> +++ w/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":: >>
