Skip to content

Commit 28a925b

Browse files
committed
Merge branch 'bb/doc-eol-dirty' into maint
Doc update. * bb/doc-eol-dirty: Documentation: mention that `eol` can change the dirty status of paths
2 parents 0445bd7 + 3bc4b8f commit 28a925b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

Documentation/gitattributes.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,10 @@ unspecified.
151151

152152
This attribute sets a specific line-ending style to be used in the
153153
working directory. It enables end-of-line conversion without any
154-
content checks, effectively setting the `text` attribute.
154+
content checks, effectively setting the `text` attribute. Note that
155+
setting this attribute on paths which are in the index with CRLF line
156+
endings may make the paths to be considered dirty. Adding the path to
157+
the index again will normalize the line endings in the index.
155158

156159
Set to string value "crlf"::
157160

0 commit comments

Comments
 (0)