From: Junio C Hamano Date: Fri, 29 Jan 2016 00:10:14 +0000 (-0800) Subject: Merge branch 'jc/strbuf-getline' X-Git-Tag: v2.8.0-rc0~91 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b62624b51a54325e6884c197352dc0dcef700325 Merge branch 'jc/strbuf-getline' The preliminary clean-up for jc/peace-with-crlf topic. * jc/strbuf-getline: strbuf: give strbuf_getline() to the "most text friendly" variant checkout-index: there are only two possible line terminations update-index: there are only two possible line terminations check-ignore: there are only two possible line terminations check-attr: there are only two possible line terminations mktree: there are only two possible line terminations strbuf: introduce strbuf_getline_{lf,nul}() strbuf: make strbuf_getline_crlf() global strbuf: miniscule style fix --- b62624b51a54325e6884c197352dc0dcef700325