summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-06 14:27:36 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-06 14:27:36 -0700
commit7dcbf891d975eba5b1e3095cb3b389834689ac09 (patch)
treea7366f7f120101529b906c01a97834a33c5608e2 /mailmap.c
parent05781d37fa43b5dada77d1bcfd4cdc42742e7421 (diff)
parentcaa47adc5a68045bfb9e88fcfee0e50589d129df (diff)
downloadgit-7dcbf891d975eba5b1e3095cb3b389834689ac09.tar.gz
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
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions