From: Matthew Ogilvie Date: Sat, 14 Nov 2009 18:35:00 GMT Subject: [PATCH] Doc: mention the crlf attribute in config autocrlf section Message-ID: <1258223700-4009-1-git-send-email-mmogilvi_git@miniinfo.net> The reverse reference has long existed, and the autocrlf description was actually obsolete and wrong (saying only file content is used), not just incomplete. Signed-off-by: Matthew Ogilvie --- Documentation/config.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index d1e2120..0dc6b12 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 -- 1.6.4.GIT