diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:23 +0300 |
| commit | 13e263095b55c88b7af86c3c88f8b0f937eb4d5c (patch) | |
| tree | 994be5d93287d7ae614c510807716c62ddfe2260 | |
| parent | b2fc9d2fb02782a20d4370d7989be8b0a54f1017 (diff) | |
| parent | c9446f0504e4b785758eed0b63c7e00c1b7091ba (diff) | |
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"
| -rw-r--r-- | Documentation/config/core.txt | 7 | ||||
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt index d0e6635fe0..7e9b6c8f4c 100644 --- a/Documentation/config/core.txt +++ b/Documentation/config/core.txt @@ -121,11 +121,14 @@ core.quotePath:: core.eol:: Sets the line ending type to use in the working directory for - files that have the `text` property set when core.autocrlf is false. + files that are marked as text (either by having the `text` + attribute set, or by having `text=auto` and Git auto-detecting + the contents as text). Alternatives are 'lf', 'crlf' and 'native', which uses the platform's native line ending. The default value is `native`. See linkgit:gitattributes[5] for more information on end-of-line - conversion. + conversion. Note that this value is ignored if `core.autocrlf` + is set to `true` or `input`. core.safecrlf:: If true, makes Git check if converting `CRLF` is reversible when 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:: |