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
This commit is contained in:
Junio C Hamano 2017-10-18 14:19:09 +09:00
Родитель 0445bd7b55 3bc4b8f7c7
Коммит 28a925bc51
1 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

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