summaryrefslogtreecommitdiff
path: root/strbuf.h
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-16/+0
* Merge branch 'bc/object-id'Junio C Hamano2018-04-101-1/+7
|\
| * strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson2018-03-141-1/+7
* | Merge branch 'en/rename-directory-detection'Junio C Hamano2018-04-101-0/+16
|\ \
| * | merge-recursive: check for file level conflicts then get new nameElijah Newren2018-02-141-0/+16
| |/
* | worktree move: accept destination as directoryNguyễn Thái Ngọc Duy2018-02-121-0/+3
|/
* strbuf: remove unused stripspace function aliasen/remove-stripspaceElijah Newren2017-12-051-9/+0
* Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano2017-10-071-2/+9
|\
| * strbuf doc: reuse after strbuf_release is finejn/strbuf-doc-re-reuseJonathan Nieder2017-10-041-2/+9
* | Merge branch 'ma/ts-cleanups'Junio C Hamano2017-09-101-1/+4
|\ \
| * | strbuf_setlen: don't write to strbuf_slopbufMartin Ågren2017-08-231-1/+4
| |/
* | strbuf: use designated initializers in STRBUF_INITJeff King2017-07-141-1/+1
|/
* Merge branch 'ab/strbuf-addftime-tzname-boolify'Junio C Hamano2017-07-061-2/+3
|\
| * strbuf: change an always NULL/"" strbuf_addftime() param to boolab/strbuf-addftime-tzname-boolifyÆvar Arnfjörð Bjarmason2017-07-011-2/+3
| * strbuf.h comment: discuss strbuf_addftime() arguments in orderÆvar Arnfjörð Bjarmason2017-06-241-1/+1
* | Merge branch 'rs/pretty-add-again'Junio C Hamano2017-06-241-6/+0
|\ \ | |/ |/|
| * pretty: recalculate duplicate short hashesrs/pretty-add-againRené Scharfe2017-06-151-6/+0
| * Merge branch 'rs/use-strbuf-addbuf' into maintJunio C Hamano2016-08-081-5/+1
| |\
| * \ Merge branch 'pb/strbuf-read-file-doc' into maintJunio C Hamano2016-07-061-0/+2
| |\ \
* | | | strbuf: let strbuf_addftime handle %z and %Z itselfRené Scharfe2017-06-151-2/+8
* | | | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+20
|\ \ \ \
| * | | | interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+5
| * | | | strbuf_branchname: add docstringJeff King2017-03-021-0/+15
| * | | | strbuf_branchname: drop return valueJeff King2017-03-021-1/+1
* | | | | Merge branch 'rs/strbuf-add-real-path'Junio C Hamano2017-03-101-0/+14
|\ \ \ \ \
| * | | | | strbuf: add strbuf_add_real_path()rs/strbuf-add-real-pathRené Scharfe2017-02-271-0/+14
| |/ / / /
* | | | | use SWAP macroRené Scharfe2017-01-301-3/+1
|/ / / /
* | | | link_alt_odb_entry: handle normalize_path errorsJeff King2016-10-101-0/+8
* | | | Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano2016-07-251-5/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()rs/use-strbuf-addbufRené Scharfe2016-07-221-5/+1
* | | | Merge branch 'pb/strbuf-read-file-doc'Junio C Hamano2016-06-271-0/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | strbuf: describe the return value of strbuf_read_filepb/strbuf-read-file-docPranit Bauva2016-06-141-0/+2
* | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-061-0/+6
|\ \ \
| * | | run_processes_parallel: treat output of children as byte arrayStefan Beller2016-03-011-0/+6
* | | | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-6/+23
|\ \ \ \ | |/ / / |/| | |
| * | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getlineJunio C Hamano2016-01-151-12/+10
| * | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-3/+15
| * | | strbuf: make strbuf_getline_crlf() globalJunio C Hamano2016-01-141-0/+7
* | | | strbuf: add strbuf_read_once to read without blockingStefan Beller2015-12-161-0/+8
|/ / /
* | | Merge branch 'tk/stripspace'Junio C Hamano2015-10-261-1/+10
|\ \ \ | | |/ | |/|
| * | strbuf: make stripspace() part of strbufTobias Klauser2015-10-161-1/+10
* | | add reentrant variants of sha1_to_hex and find_unique_abbrevJeff King2015-09-251-0/+8
* | | strbuf: make strbuf_complete_line more genericJeff King2015-09-251-2/+13
|/ /
* | Merge branch 'jk/date-mode-format'Junio C Hamano2015-08-031-0/+5
|\ \
| * | introduce "format" date-modeJeff King2015-06-291-0/+5
* | | Merge branch 'mh/strbuf-read-file-returns-ssize-t'Junio C Hamano2015-07-131-1/+1
|\ \ \ | |/ / |/| / | |/
| * strbuf: strbuf_read_file() should return ssize_tmh/strbuf-read-file-returns-ssize-tMichael Haggerty2015-07-031-1/+1
* | strbuf_addch: avoid calling strbuf_growJeff King2015-04-161-1/+2
|/
* strbuf.h: group documentation for trim functionsjk/strbuf-doc-to-headerJeff King2015-01-161-10/+2
* strbuf.h: drop boilerplate descriptions of strbuf_split_*Jeff King2015-01-161-12/+5