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

* mo/maint-crlf-doc:
core.autocrlf documentation: mention the crlf attribute

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 01766b0aa59afbe6711c1f48944e661428bb15aa..35e72e4a380496b20d4c606a69f8fa5ad2766b10 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -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