summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/merge-microcleanup' into maintJunio C Hamano2017-09-101-2/+2
|\
| * merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
* | Merge branch 'rj/add-chmod-error-message' into maintJunio C Hamano2017-09-101-3/+3
|\ \
| * | builtin/add: add detail to a 'cannot chmod' error messagerj/add-chmod-error-messageRamsay Jones2017-08-091-3/+3
* | | Merge branch 'mg/killed-merge' into maintJunio C Hamano2017-09-101-3/+12
|\ \ \
| * | | merge: save merge state earliermg/killed-mergeMichael J Gruber2017-08-231-0/+2
| * | | merge: split write_merge_state in twoMichael J Gruber2017-08-231-3/+8
| * | | merge: clarify call chainMichael J Gruber2017-08-231-0/+2
* | | | Merge branch 'rs/fsck-obj-leakfix' into maintJunio C Hamano2017-09-101-11/+11
|\ \ \ \
| * | | | fsck: free buffers on error in fsck_obj()rs/fsck-obj-leakfixRené Scharfe2017-08-101-11/+11
* | | | | Merge branch 'pw/am-signoff' into maintJunio C Hamano2017-09-101-25/+1
|\ \ \ \ \
| * | | | | am: fix signoff when other trailers are presentpw/am-signoffPhillip Wood2017-08-081-25/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bw/clone-recursive-quiet' into maintJunio C Hamano2017-09-101-0/+3
|\ \ \ \ \
| * | | | | clone: teach recursive clones to respect -qbw/clone-recursive-quietBrandon Williams2017-08-041-0/+3
| |/ / / /
| * | | | Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-311-0/+4
| |\ \ \ \
* | \ \ \ \ Merge branch 'pw/sequence-rerere-autoupdate' into maintJunio C Hamano2017-09-102-0/+14
|\ \ \ \ \ \
| * | | | | | cherry-pick/revert: reject --rerere-autoupdate when continuingpw/sequence-rerere-autoupdatePhillip Wood2017-08-021-0/+2
| * | | | | | am: remember --rerere-autoupdate settingPhillip Wood2017-08-021-0/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw/push-options-recursively-to-submodules' into maintJunio C Hamano2017-09-101-9/+40
|\ \ \ \ \ \
| * | | | | | submodule--helper: teach push-check to handle HEADbw/push-options-recursively-to-submodulesBrandon Williams2017-07-201-9/+40
* | | | | | | Merge branch 'ma/pager-per-subcommand-action' into maintJunio C Hamano2017-09-101-0/+3
|\ \ \ \ \ \ \
| * | | | | | | tag: change default of `pager.tag` to "on"Martin Ågren2017-08-031-1/+1
| * | | | | | | tag: respect `pager.tag` in list-mode onlyMartin Ågren2017-08-031-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/rev-list-empty-input' into maintJunio C Hamano2017-09-101-1/+2
|\ \ \ \ \ \ \
| * | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-021-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'jt/subprocess-handshake' into maintJunio C Hamano2017-08-231-0/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-0/+3
* | | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup' into maintJunio C Hamano2017-08-231-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fmt-merge-msg: fix coding styledc/fmt-merge-msg-microcleanupDimitrios Christidis2017-07-251-1/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'js/run-process-parallel-api-fix' into maintJunio C Hamano2017-08-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | run_processes_parallel: change confusing task_cb conventionjs/run-process-parallel-api-fixJohannes Schindelin2017-07-211-1/+1
* | | | | | | | | Merge branch 'rs/pack-objects-pbase-cleanup' into maintJunio C Hamano2017-08-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: remove unnecessary NULL checkrs/pack-objects-pbase-cleanupRené Scharfe2017-07-201-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jt/fsck-code-cleanup' into maintJunio C Hamano2017-08-231-25/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck: cleanup unused variableJonathan Tan2017-07-261-3/+1
| * | | | | | | | | object: remove "used" field from struct objectJonathan Tan2017-07-201-10/+14
| * | | | | | | | | fsck: remove redundant parse_tree() invocationJonathan Tan2017-07-201-12/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/move-array' into maintJunio C Hamano2017-08-233-7/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-files: don't try to prune an empty indexrs/move-arrayRené Scharfe2017-07-171-1/+1
| * | | | | | | | | use MOVE_ARRAYRené Scharfe2017-07-173-6/+4
* | | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix' into maintJunio C Hamano2017-08-231-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | commit: check for empty message before the check for untouched templateks/commit-abort-on-empty-message-fixKaartic Sivaraam2017-07-171-5/+5
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-07-121-6/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano2017-07-121-1/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-walk' into maintJunio C Hamano2017-08-232-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | rev-list: check reflog_info before showing usageJeff King2017-07-091-1/+2
| * | | | | | | | | | | | log: do not free parents when walking reflogJeff King2017-07-091-2/+2
| * | | | | | | | | | | | log: clarify comment about reflog cyclesJeff King2017-07-091-1/+4
* | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors' into maintJunio C Hamano2017-08-238-73/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
View Lorry Controller Status