summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mailinfo.c: move side-effects outside of assertjt/mailinfo-fold-in-body-headersKyle J. McKay2016-12-201-1/+2
* mailinfo: handle in-body header continuationsJonathan Tan2016-09-2112-4/+125
* mailinfo: make is_scissors_line take plain char *Jonathan Tan2016-09-191-17/+18
* mailinfo: separate in-body header processingJonathan Tan2016-09-191-16/+17
* Sync with maintJunio C Hamano2016-09-191-0/+33
|\
| * Start preparing for 2.10.1Junio C Hamano2016-09-192-1/+34
| * Merge branch 'sb/diff-cleanup' into maintJunio C Hamano2016-09-191-21/+10
| |\
| * \ Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-195-7/+7
| |\ \
| * \ \ Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano2016-09-191-1/+1
| |\ \ \
| * \ \ \ Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano2016-09-191-9/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/t9903-chaining' into maintJunio C Hamano2016-09-191-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-196-78/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/compat-strdup' into maintJunio C Hamano2016-09-194-19/+33
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maintJunio C Hamano2016-09-193-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ep/use-git-trace-curl-in-tests' into maintJunio C Hamano2016-09-194-9/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/t6026-clean-up' into maintJunio C Hamano2016-09-191-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maintJunio C Hamano2016-09-192-7/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/submodule-anchor-git-dir' into maintJunio C Hamano2016-09-192-0/+36
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-lib-drop-pid-from-results' into maintJunio C Hamano2016-09-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bh/diff-highlight-graph' into maintJunio C Hamano2016-09-195-6/+338
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'po/range-doc' into maintJunio C Hamano2016-09-195-51/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Third batch for 2.11Junio C Hamano2016-09-191-0/+11
* | | | | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2016-09-1941-639/+667
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | builtin/reset: convert to use struct object_idbrian m. carlson2016-09-071-26/+26
| * | | | | | | | | | | | | | | | | builtin/commit-tree: convert to struct object_idbrian m. carlson2016-09-071-10/+10
| * | | | | | | | | | | | | | | | | builtin/am: convert to struct object_idbrian m. carlson2016-09-071-70/+70
| * | | | | | | | | | | | | | | | | refs: add an update_ref_oid function.brian m. carlson2016-09-072-0/+11
| * | | | | | | | | | | | | | | | | sha1_name: convert get_sha1_mb to struct object_idbrian m. carlson2016-09-073-11/+11
| * | | | | | | | | | | | | | | | | builtin/update-index: convert file to struct object_idbrian m. carlson2016-09-071-30/+31
| * | | | | | | | | | | | | | | | | notes: convert init_notes to use struct object_idbrian m. carlson2016-09-071-6/+6
| * | | | | | | | | | | | | | | | | builtin/rm: convert to use struct object_idbrian m. carlson2016-09-071-9/+9
| * | | | | | | | | | | | | | | | | builtin/blame: convert file to use struct object_idbrian m. carlson2016-09-071-14/+14
| * | | | | | | | | | | | | | | | | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-076-17/+18
| * | | | | | | | | | | | | | | | | notes-merge: convert struct notes_merge_pair to struct object_idbrian m. carlson2016-09-071-62/+65
| * | | | | | | | | | | | | | | | | builtin/checkout: convert some static functions to struct object_idbrian m. carlson2016-09-071-33/+33
| * | | | | | | | | | | | | | | | | streaming: make stream_blob_to_fd take struct object_idbrian m. carlson2016-09-076-10/+10
| * | | | | | | | | | | | | | | | | builtin: convert textconv_object to use struct object_idbrian m. carlson2016-09-074-9/+9
| * | | | | | | | | | | | | | | | | builtin/cat-file: convert some static functions to struct object_idbrian m. carlson2016-09-071-25/+25
| * | | | | | | | | | | | | | | | | builtin/cat-file: convert struct expand_data to use struct object_idbrian m. carlson2016-09-071-10/+12
| * | | | | | | | | | | | | | | | | builtin/log: convert some static functions to use struct object_idbrian m. carlson2016-09-071-22/+22
| * | | | | | | | | | | | | | | | | builtin/blame: convert struct origin to use struct object_idbrian m. carlson2016-09-071-20/+20
| * | | | | | | | | | | | | | | | | builtin/apply: convert static functions to struct object_idbrian m. carlson2016-09-071-48/+48
| * | | | | | | | | | | | | | | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-0726-69/+79
* | | | | | | | | | | | | | | | | | Merge branch 'mh/ref-store'Junio C Hamano2016-09-195-317/+812
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | refs: implement iteration over only per-worktree refsmh/ref-storeDavid Turner2016-09-092-1/+13
| * | | | | | | | | | | | | | | | | | refs: make lock genericDavid Turner2016-09-092-13/+14
| * | | | | | | | | | | | | | | | | | refs: add method to rename refsDavid Turner2016-09-093-18/+17
| * | | | | | | | | | | | | | | | | | refs: add methods to init refs dbDavid Turner2016-09-095-10/+42
| * | | | | | | | | | | | | | | | | | refs: make delete_refs() virtualDavid Turner2016-09-093-2/+14
| * | | | | | | | | | | | | | | | | | refs: add method for initial ref transaction commitDavid Turner2016-09-093-3/+14