My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 352d72a caa47ad)
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)
commit8e342255224f459ddff4d7f974161ae47d26d1d7
treefc6f86ac1e51e7f5db5e101827363e062d092c57tree | snapshot
parent352d72a30e3d113064ebc194f49560eeae34b332commit | diff
parentcaa47adc5a68045bfb9e88fcfee0e50589d129dfcommit | diff
Merge branch 'tb/core-eol-fix'

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
Documentation/config.txt diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
The core git plumbing