From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Nov 2009 00:29:57 +0000 (-0800)
Subject: Merge branch 'mo/maint-crlf-doc'
X-Git-Tag: v1.6.6-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4075d27a65e00e8eb5124b70a37f6d25c5b14d35?hp=f328f35880678fadd460939fa06fff3c5a9d0838

Merge branch 'mo/maint-crlf-doc'

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d8b842bd0e..155e925fba 100644
--- 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