diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:23 -0800 |
| commit | 13e263095b55c88b7af86c3c88f8b0f937eb4d5c (patch) | |
| tree | 994be5d93287d7ae614c510807716c62ddfe2260 /Documentation/gitattributes.txt | |
| parent | b2fc9d2fb02782a20d4370d7989be8b0a54f1017 (diff) | |
| parent | c9446f0504e4b785758eed0b63c7e00c1b7091ba (diff) | |
| download | git-13e263095b55c88b7af86c3c88f8b0f937eb4d5c.tar.gz | |
Merge branch 'jk/autocrlf-overrides-eol-doc'
Documentation around core.crlf has been updated.
* jk/autocrlf-overrides-eol-doc:
docs/config: clarify "text property" in core.eol
doc/gitattributes: clarify "autocrlf overrides eol"
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index a2310fb920..9b41f81c06 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -124,7 +124,9 @@ text file is normalized, its line endings are converted to LF in the repository. To control what line ending style is used in the working directory, use the `eol` attribute for a single file and the `core.eol` configuration variable for all text files. -Note that `core.autocrlf` overrides `core.eol` +Note that setting `core.autocrlf` to `true` or `input` overrides +`core.eol` (see the definitions of those options in +linkgit:git-config[1]). Set:: |