Merge branch 'wp/doc-filter-direction' into maint
* wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
This commit is contained in:
commit
0737975d16
@ -198,11 +198,11 @@ core.quotepath::
|
|||||||
|
|
||||||
core.autocrlf::
|
core.autocrlf::
|
||||||
If true, makes git convert `CRLF` at the end of lines in text files to
|
If true, makes git convert `CRLF` at the end of lines in text files to
|
||||||
`LF` when reading from the filesystem, and convert in reverse when
|
`LF` when reading from the work tree, and convert in reverse when
|
||||||
writing to the filesystem. The variable can be set to
|
writing to the work tree. 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 work tree but files are written out to the work
|
||||||
`LF` at the end of lines. A file is considered
|
tree with `LF` at the end of lines. A file is considered
|
||||||
"text" (i.e. be subjected to the autocrlf mechanism) based on
|
"text" (i.e. be subjected to the autocrlf mechanism) based on
|
||||||
the file's `crlf` attribute, or if `crlf` is unspecified,
|
the file's `crlf` attribute, or if `crlf` is unspecified,
|
||||||
based on the file's contents. See linkgit:gitattributes[5].
|
based on the file's contents. See linkgit:gitattributes[5].
|
||||||
|
Loading…
x
Reference in New Issue
Block a user