| commit | 70ad8c8d8c0840fb89492063274132d28bdfbe3b | |
| author | Torsten Bögershausen <tboegi@web.de> | |
| Mon, 25 Apr 2016 16:56:29 +0000 (25 18:56 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 19:11:45 +0000 (25 12:11 -0700) | ||
| tree | b7dc574bd123842038e3ea2500112f3d704657c8 | treesnapshot (tar.gz zip) |
| parent | ded2444ad8ab8128cae2b91b8efa57ea2dd8c7a5 | commitdiff |
convert: allow core.autocrlf=input and core.eol=crlf
Even though the configuration parser errors out when core.autocrlf
is set to 'input' when core.eol is set to 'crlf', there is no need
to do so, because the core.autocrlf setting trumps core.eol.
Allow all combinations of core.crlf and core.eol and document
that core.autocrlf overrides core.eol.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Even though the configuration parser errors out when core.autocrlf
is set to 'input' when core.eol is set to 'crlf', there is no need
to do so, because the core.autocrlf setting trumps core.eol.
Allow all combinations of core.crlf and core.eol and document
that core.autocrlf overrides core.eol.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/config.txt | diffblobblamehistory | |
| config.c | diffblobblamehistory |