Skip to content

Commit 0737975

Browse files
committed
Merge branch 'wp/doc-filter-direction' into maint
* wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
2 parents 4fd8145 + c308b9c commit 0737975

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/config.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ core.quotepath::
198198

199199
core.autocrlf::
200200
If true, makes git convert `CRLF` at the end of lines in text files to
201-
`LF` when reading from the filesystem, and convert in reverse when
202-
writing to the filesystem. The variable can be set to
201+
`LF` when reading from the work tree, and convert in reverse when
202+
writing to the work tree. The variable can be set to
203203
'input', in which case the conversion happens only while
204-
reading from the filesystem but files are written out with
205-
`LF` at the end of lines. A file is considered
204+
reading from the work tree but files are written out to the work
205+
tree with `LF` at the end of lines. A file is considered
206206
"text" (i.e. be subjected to the autocrlf mechanism) based on
207207
the file's `crlf` attribute, or if `crlf` is unspecified,
208208
based on the file's contents. See linkgit:gitattributes[5].

0 commit comments

Comments
 (0)