Andrew's git / gitweb.git / diff
?
Merge branch 'tb/core-eol-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:30 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:30 +0000 (14:54 -0700)
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

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history
config.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/config.txt
Simple merge
diff --cc config.c
Simple merge