Merge branch 'mo/maint-crlf-doc' into maint

* mo/maint-crlf-doc:
  core.autocrlf documentation: mention the crlf attribute
This commit is contained in:
Junio C Hamano 2009-12-03 13:52:11 -08:00
Родитель e24bd95879 ff68668695
Коммит 3c362d4baa
1 изменённых файлов: 4 добавлений и 3 удалений

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

@ -169,9 +169,10 @@ core.autocrlf::
writing to the filesystem. The variable can be set to
'input', in which case the conversion happens only while
reading from the filesystem but files are written out with
`LF` at the end of lines. Currently, which paths to consider
"text" (i.e. be subjected to the autocrlf mechanism) is
decided purely based on the contents.
`LF` at the end of lines. A file is considered
"text" (i.e. be subjected to the autocrlf mechanism) based on
the file's `crlf` attribute, or if `crlf` is unspecified,
based on the file's contents. See linkgit:gitattributes[5].
core.safecrlf::
If true, makes git check if converting `CRLF` as controlled by