summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2016-04-25 18:56:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 12:11:45 -0700
commit70ad8c8d8c0840fb89492063274132d28bdfbe3b (patch)
treeb7dc574bd123842038e3ea2500112f3d704657c8 /contrib
parentt0027: make commit_chk_wrnNNO() reliable (diff)
downloadtgif-70ad8c8d8c0840fb89492063274132d28bdfbe3b.tar.xz
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>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions