aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* 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
| * | | | | | | | | object: remove "used" field from struct objectJonathan Tan2017-07-20
| * | | | | | | | | fsck: remove redundant parse_tree() invocationJonathan Tan2017-07-20
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/move-array' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-files: don't try to prune an empty indexRené Scharfe2017-07-17
| * | | | | | | | | use MOVE_ARRAYRené Scharfe2017-07-17
* | | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: check for empty message before the check for untouched templateKaartic Sivaraam2017-07-17
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-12
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-list: check reflog_info before showing usageJeff King2017-07-09
| * | | | | | | | | | | | log: do not free parents when walking reflogJeff King2017-07-09
| * | | | | | | | | | | | log: clarify comment about reflog cyclesJeff King2017-07-09
* | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |