summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-14 02:32:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-15 18:23:57 (GMT)
commit1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (patch)
treefea2d4a8ae1b60e90034f2bc3e40ce09978c5a6c /builtin/merge-file.c
parenta392f57daf7dc5e72ab3ada7802eddc000fa3081 (diff)
downloadgit-1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2.zip
git-1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2.tar.gz
git-1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2.tar.bz2
strbuf: give strbuf_getline() to the "most text friendly" variant
Now there is no direct caller to strbuf_getline(), we can demote it to file-scope static that is private to strbuf.c and rename it to strbuf_getdelim(). Rename strbuf_getline_crlf(), which is designed to be the most "text friendly" variant, and allow it to take over this simplest name, strbuf_getline(), so we can add more uses of it without having to type _crlf over and over again in the coming steps. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions