From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:30 +0000 (-0700)
Subject: Merge branch 'tb/core-eol-fix'
X-Git-Tag: v2.9.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e342255224f459ddff4d7f974161ae47d26d1d7;p=thirdparty%2Fgit.git

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
---

8e342255224f459ddff4d7f974161ae47d26d1d7