aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-18 21:32:21 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-18 21:32:21 -0700
commitc4df50c2d8afed81e4c3170f51eff1d11dea1d94 (patch)
tree95a308008bb14db6942f888c67682f435e6cfe82
parentbc32d342c2aaa1fa425e7924e4b64951a76bb314 (diff)
parentc308b9c25d54c72977d16155ae04e37f3490d5ac (diff)
downloadgit-c4df50c2d8afed81e4c3170f51eff1d11dea1d94.tar.gz
git-c4df50c2d8afed81e4c3170f51eff1d11dea1d94.tar.xz
Merge branch 'wp/doc-filter-direction'
* wp/doc-filter-direction: documentation: clarify direction of core.autocrlf
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index aa5411e45..92f851e79 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -198,11 +198,11 @@ core.quotepath::
core.autocrlf::
If true, makes git convert `CRLF` at the end of lines in text files to
- `LF` when reading from the filesystem, and convert in reverse when
- writing to the filesystem. The variable can be set to
+ `LF` when reading from the work tree, and convert in reverse when
+ writing to the work tree. 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. A file is considered
+ reading from the work tree but files are written out to the work
+ tree with `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].