diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 14:27:36 -0700 |
| commit | 7dcbf891d975eba5b1e3095cb3b389834689ac09 (patch) | |
| tree | a7366f7f120101529b906c01a97834a33c5608e2 /Documentation/config.txt | |
| parent | 05781d37fa43b5dada77d1bcfd4cdc42742e7421 (diff) | |
| parent | caa47adc5a68045bfb9e88fcfee0e50589d129df (diff) | |
| download | git-7dcbf891d975eba5b1e3095cb3b389834689ac09.tar.gz | |
Merge branch 'tb/core-eol-fix' into maint
A couple of bugs around core.autocrlf have been fixed.
* tb/core-eol-fix:
convert.c: ident + core.autocrlf didn't work
t0027: test cases for combined attributes
convert: allow core.autocrlf=input and core.eol=crlf
t0027: make commit_chk_wrnNNO() reliable
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b945d67bc0..02696208c9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -353,9 +353,9 @@ core.quotePath:: core.eol:: Sets the line ending type to use in the working directory for - files that have the `text` property set. Alternatives are - 'lf', 'crlf' and 'native', which uses the platform's native - line ending. The default value is `native`. See + files that have the `text` property set when core.autocrlf is false. + 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. |