mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 18:16:11 +02:00
Code

Merge branch 'bc/clarify-eol-attr' 

Documentation update

* bc/clarify-eol-attr:
  doc: clarify interaction between 'eol' and text=auto
This commit is contained in:
Junio C Hamano 2022-02-23 16:58:04 -08:00
parent 008adee208 6a5678f257
commit 66633f25c6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/gitattributes.txt
View File

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