aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-18
|\
| * branch: reset instead of release a strbufStefan Beller2017-10-04
* | Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-18
|\ \
| * | name-rev: change ULONG_MAX to TIME_MAXMichael J Gruber2017-09-06
* | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-18
|\ \ \
| * | | cat-file: handle NULL object_context.pathJeff King2017-09-22
* | | | Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-18
|\ \ \ \
| * | | | describe: fix matching to actually match all patternsMax Kirillov2017-09-17
* | | | | Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano2017-10-18
|\ \ \ \ \
| * | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostnameJunio C Hamano2017-09-17
* | | | | | Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano2017-10-18
|\ \ \ \ \ \
| * | | | | | commit-tree: do not complete line in -F inputRoss Kabus2017-09-10
* | | | | | | Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2017-10-18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | rev-parse: don't trim bisect refnamesJeff King2017-09-07
* | | | | | | Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \
| * | | | | | | merge: use skip_prefix()René Scharfe2017-08-10
* | | | | | | | Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/add: add detail to a 'cannot chmod' error messageRamsay Jones2017-08-09
* | | | | | | | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: save merge state earlierMichael J Gruber2017-08-23
| * | | | | | | | | merge: split write_merge_state in twoMichael J Gruber2017-08-23
| * | | | | | | | | merge: clarify call chainMichael J Gruber2017-08-23
* | | | | | | | | | Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: free buffers on error in fsck_obj()René Scharfe2017-08-10
* | | | | | | | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am: fix signoff when other trailers are presentPhillip Wood2017-08-08
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: teach recursive clones to respect -qBrandon Williams2017-08-04
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-31
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingPhillip Wood2017-08-02
| * | | | | | | | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-02
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | submodule--helper: teach push-check to handle HEADBrandon Williams2017-07-20
* | | | | | | | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-03
| * | | | | | | | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-03
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/rev-list-empty-input' into maintJunio C Hamano2017-09-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-02
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-26
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-30
* | | | | | | | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fmt-merge-msg: fix coding styleDimitrios Christidis2017-07-25
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | run_processes_parallel: change confusing task_cb conventionJohannes Schindelin2017-07-21
* | | | | | | | | | | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | pack-objects: remove unnecessary NULL checkRené Scharfe2017-07-20
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fsck: cleanup unused variableJonathan Tan2017-07-26