Merge branch 'tb/core-eol-fix' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b945d67bc00d9b6fea7ae805c7d0a9e1f5962b1a..02696208c9d8f014ad148eca4874b06f9db2fcfb 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -353,9 +353,9 @@ core.quotePath::
 
 core.eol::
        Sets the line ending type to use in the working directory for
-       files that have the `text` property set.  Alternatives are
-       'lf', 'crlf' and 'native', which uses the platform's native
-       line ending.  The default value is `native`.  See
+       files that have the `text` property set when core.autocrlf is false.
+       Alternatives are 'lf', 'crlf' and 'native', which uses the platform's
+       native line ending.  The default value is `native`.  See
        linkgit:gitattributes[5] for more information on end-of-line
        conversion.