Skip to content

Commit 66633f2

Browse files
committed
Merge branch 'bc/clarify-eol-attr'
Documentation update * bc/clarify-eol-attr: doc: clarify interaction between 'eol' and text=auto
2 parents 008adee + 6a5678f commit 66633f2

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Documentation/gitattributes.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,12 @@ unspecified.
161161

162162
This attribute sets a specific line-ending style to be used in the
163163
working directory. This attribute has effect only if the `text`
164-
attribute is set or unspecified, or if it is set to `auto` and the file
165-
is detected as text. Note that setting this attribute on paths which
166-
are in the index with CRLF line endings may make the paths to be
167-
considered dirty. Adding the path to the index again will normalize the
168-
line endings in the index.
164+
attribute is set or unspecified, or if it is set to `auto`, the file is
165+
detected as text, and it is stored with LF endings in the index. Note
166+
that setting this attribute on paths which are in the index with CRLF
167+
line endings may make the paths to be considered dirty unless
168+
`text=auto` is set. Adding the path to the index again will normalize
169+
the line endings in the index.
169170

170171
Set to string value "crlf"::
171172

0 commit comments

Comments
 (0)