diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:11 -0800 |
| commit | 3c362d4baa877bb9c6c332cfdc3aa81461e06024 (patch) | |
| tree | 9f201c9b203ff2fd2a7bf1d40c9b8ec1bf259a5d | |
| parent | e24bd95879dbaf2a6232e7f621b0bab545319209 (diff) | |
| parent | ff68668695486b72b5f06146eddf85b70841088a (diff) | |
| download | git-3c362d4baa877bb9c6c332cfdc3aa81461e06024.tar.gz git-3c362d4baa877bb9c6c332cfdc3aa81461e06024.tar.xz | |
Merge branch 'mo/maint-crlf-doc' into maint
* mo/maint-crlf-doc:
core.autocrlf documentation: mention the crlf attribute
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 01766b0aa..35e72e4a3 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 |