diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-22 22:29:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-22 22:29:50 -0700 |
| commit | 0737975d161a557da95efa67decae64aa9037b6d (patch) | |
| tree | c9be22340203cb999e775661db9ff4644ca2cfbc | |
| parent | Merge branch 'jk/maint-diffstat-overflow' into maint (diff) | |
| parent | documentation: clarify direction of core.autocrlf (diff) | |
| download | tgif-0737975d161a557da95efa67decae64aa9037b6d.tar.xz | |
Merge branch 'wp/doc-filter-direction' into maint
* wp/doc-filter-direction:
documentation: clarify direction of core.autocrlf
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 75b8afec09..f6ddd35c01 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]. |