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/config | |
| parent | Merge branch 'jk/unused-parameter-cleanup' (diff) | |
| parent | docs/config: clarify "text property" in core.eol (diff) | |
| download | tgif-13e263095b55c88b7af86c3c88f8b0f937eb4d5c.tar.xz | |
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/config')
| -rw-r--r-- | Documentation/config/core.txt | 7 |
1 files changed, 5 insertions, 2 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 |