diff options
| author | Matthew Ogilvie <mmogilvi_git@miniinfo.net> | 2009-11-14 11:35:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 22:32:05 -0800 |
| commit | ff68668695486b72b5f06146eddf85b70841088a (patch) | |
| tree | 22335da51e74eb016bf876a35a9b1f63fc8b76af /Documentation | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-ff68668695486b72b5f06146eddf85b70841088a.tar.gz git-ff68668695486b72b5f06146eddf85b70841088a.tar.xz | |
core.autocrlf documentation: mention the crlf attribute
The description of the configuration variable is obsolete and
wrong (saying only file content is used), not just incomplete.
It has used the attribute mechanism for a long time.
The documentation of gitattributes mentions the core.autocrlf
configuration variable in its description of crlf attribute.
Refer to the gitattributes documentation from here as well.
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 cd1781498..fa0e8596c 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 |