Skip to content

Commit ff68668

Browse files
Matthew Ogilviegitster
authored andcommitted
core.autocrlf documentation: mention the crlf attribute
The description of the configuration variable is obsolete and wrong (saying only file content is used), not just incomplete. It has used the attribute mechanism for a long time. The documentation of gitattributes mentions the core.autocrlf configuration variable in its description of crlf attribute. Refer to the gitattributes documentation from here as well. Signed-off-by: Matthew Ogilvie <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 78d553b commit ff68668

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Documentation/config.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,10 @@ core.autocrlf::
169169
writing to the filesystem. The variable can be set to
170170
'input', in which case the conversion happens only while
171171
reading from the filesystem but files are written out with
172-
`LF` at the end of lines. Currently, which paths to consider
173-
"text" (i.e. be subjected to the autocrlf mechanism) is
174-
decided purely based on the contents.
172+
`LF` at the end of lines. A file is considered
173+
"text" (i.e. be subjected to the autocrlf mechanism) based on
174+
the file's `crlf` attribute, or if `crlf` is unspecified,
175+
based on the file's contents. See linkgit:gitattributes[5].
175176

176177
core.safecrlf::
177178
If true, makes git check if converting `CRLF` as controlled by

0 commit comments

Comments
 (0)