mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 05:13:58 +01:00
Code

Merge branch 'bb/doc-eol-dirty' into maint

Browse Source 
Doc update.

* bb/doc-eol-dirty:
  Documentation: mention that `eol` can change the dirty status of paths
This commit is contained in:
Junio C Hamano 2017-10-18 14:19:09 +09:00
commit 28a925bc51
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/gitattributes.txt
View File

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