From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Sep 2017 01:47:54 +0000 (+0900)
Subject: Merge branch 'bb/doc-eol-dirty'
X-Git-Tag: v2.15.0-rc0~89
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0517ae0ba6a69c5c11cb8660c3d491f525cba09c?hp=281b1cf85668d6243fd714dc453f9ddfd32e90da

Merge branch 'bb/doc-eol-dirty'

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"::