diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-01-13 18:32:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-15 10:23:57 -0800 |
| commit | 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (patch) | |
| tree | fea2d4a8ae1b60e90034f2bc3e40ce09978c5a6c /Documentation/merge-strategies.txt | |
| parent | checkout-index: there are only two possible line terminations (diff) | |
| download | tgif-1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2.tar.xz | |
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 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions