summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs_resolve_ref_unsafe: handle d/f conflicts for writesjk/refs-df-conflictJeff King2017-10-073-2/+49
* t3308: create a real ref directory/file conflictJeff King2017-10-071-1/+1
* Git 2.15-rc0v2.15.0-rc0Junio C Hamano2017-10-052-1/+17
* Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2017-10-052-3/+3
|\
| * request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-032-3/+3
* | Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano2017-10-051-1/+1
|\ \
| * | run-command: use ALLOC_ARRAYrs/run-command-use-alloc-arrayRené Scharfe2017-10-031-1/+1
* | | Merge branch 'sb/git-clang-format'Junio C Hamano2017-10-051-1/+5
|\ \ \
| * | | clang-format: add a comment about the meaning/status of thesb/git-clang-formatStephan Beyer2017-10-021-1/+5
* | | | Merge branch 'rs/use-free-and-null'Junio C Hamano2017-10-051-18/+9
|\ \ \ \
| * | | | repository: use FREE_AND_NULLrs/use-free-and-nullRené Scharfe2017-10-021-18/+9
* | | | | Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano2017-10-051-4/+4
|\ \ \ \ \
| * | | | | tag: avoid NULL pointer arithmeticrs/tag-null-pointer-arith-fixRené Scharfe2017-10-021-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano2017-10-051-5/+5
|\ \ \ \ \
| * | | | | coccinelle: remove parentheses that become unnecessaryrs/cocci-de-paren-call-paramsRené Scharfe2017-10-021-5/+5
| |/ / / /
* | | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-055-12/+8
|\ \ \ \ \
| * | | | | graph: use strbuf_addchars() to add spacesrs/cleanup-strbuf-usersRené Scharfe2017-10-021-7/+3
| * | | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-023-4/+4
| * | | | | path: use strbuf_add_real_path()René Scharfe2017-10-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-057-20/+9
|\ \ \ \ \
| * | | | | refs: pass NULL to resolve_refdup() if hash is not neededrs/resolve-ref-optional-resultRené Scharfe2017-10-016-18/+8
| * | | | | refs: pass NULL to refs_resolve_refdup() if hash is not neededRené Scharfe2017-10-011-2/+1
* | | | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2017-10-052-3/+145
|\ \ \ \ \ \
| * | | | | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0er/fast-import-dump-refs-on-checkpointEric Rannaud2017-09-292-3/+145
* | | | | | | The twelfth batch for 2.15Junio C Hamano2017-10-031-0/+24
* | | | | | | Merge branch 'bw/git-clang-format'Junio C Hamano2017-10-031-6/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | clang-format: adjust line break penaltiesbw/git-clang-formatJohannes Schindelin2017-10-011-6/+6
* | | | | | | Merge branch 'ad/doc-markup-fix'Junio C Hamano2017-10-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | doc: correct command formattingad/doc-markup-fixAdam Dinwoodie2017-09-291-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mh/mmap-packed-refs'Junio C Hamano2017-10-039-369/+848
|\ \ \ \ \ \ \
| * | | | | | | packed-backend.c: rename a bunch of things and update commentsmh/mmap-packed-refsMichael Haggerty2017-09-251-190/+232
| * | | | | | | mmapped_ref_iterator: inline into `packed_ref_iterator`Michael Haggerty2017-09-251-170/+114
| * | | | | | | ref_cache: remove support for storing peeled valuesMichael Haggerty2017-09-253-72/+11
| * | | | | | | packed_ref_store: get rid of the `ref_cache` entirelyMichael Haggerty2017-09-251-27/+2
| * | | | | | | ref_store: implement `refs_peel_ref()` genericallyMichael Haggerty2017-09-254-78/+17
| * | | | | | | packed_read_raw_ref(): read the reference from the mmapped bufferMichael Haggerty2017-09-251-5/+9
| * | | | | | | packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`Michael Haggerty2017-09-251-3/+106
| * | | | | | | read_packed_refs(): ensure that references are ordered when readMichael Haggerty2017-09-251-11/+212
| * | | | | | | packed_ref_cache: keep the `packed-refs` file mmapped if possibleMichael Haggerty2017-09-253-42/+152
| * | | | | | | packed-backend.c: reorder some definitionsMichael Haggerty2017-09-251-24/+24
| * | | | | | | mmapped_ref_iterator_advance(): no peeled value for broken refsMichael Haggerty2017-09-251-2/+8
| * | | | | | | mmapped_ref_iterator: add iterator over a packed-refs fileMichael Haggerty2017-09-251-55/+152
| * | | | | | | packed_ref_cache: remember the file-wide peeling stateMichael Haggerty2017-09-251-5/+12
| * | | | | | | read_packed_refs(): read references with minimal copyingMichael Haggerty2017-09-251-61/+40
| * | | | | | | read_packed_refs(): make parsing of the header line more robustMichael Haggerty2017-09-141-6/+15
| * | | | | | | read_packed_refs(): only check for a header at the top of the fileMichael Haggerty2017-09-141-11/+24
| * | | | | | | read_packed_refs(): use mmap to read the `packed-refs` fileMichael Haggerty2017-09-141-10/+32
| * | | | | | | die_unterminated_line(), die_invalid_line(): new functionsMichael Haggerty2017-09-141-3/+25
| * | | | | | | packed_ref_cache: add a backlink to the associated `packed_ref_store`Michael Haggerty2017-09-141-7/+16
| * | | | | | | prefix_ref_iterator: break when we leave the prefixJeff King2017-09-141-1/+31
View Lorry Controller Status