Merge branch 'mo/maint-crlf-doc'

* mo/maint-crlf-doc:
  core.autocrlf documentation: mention the crlf attribute
This commit is contained in:
Junio C Hamano 2009-11-22 16:29:57 -08:00
commit 4075d27a65

View File

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