Merge branch 'jc/strbuf-getline'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:14 +0000 (16:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2016 00:10:14 +0000 (16:10 -0800)
commitb62624b51a54325e6884c197352dc0dcef700325
tree2a5c68bae2133bbb762253f183abcc6f00f8faef
parent116a866bf50da9b893623ebb940e1c6bff7a29bc
parent1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2
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
builtin/am.c
builtin/clone.c
builtin/commit.c
builtin/grep.c
builtin/notes.c
builtin/pull.c
strbuf.c
strbuf.h