git.oblomov.eu Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 6 Jun 2016 21:27:36 +0000 (14:27 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 6 Jun 2016 21:27:36 +0000 (14:27 -0700)
commit	7dcbf891d975eba5b1e3095cb3b389834689ac09
tree	a7366f7f120101529b906c01a97834a33c5608e2	tree \| snapshot
parent	05781d37fa43b5dada77d1bcfd4cdc42742e7421	commit \| diff
parent	caa47adc5a68045bfb9e88fcfee0e50589d129df	commit \| diff

Merge branch 'tb/core-eol-fix' into maint

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
config.c	diff1 \|	diff2 \|	blob \| history