summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | ref-filter: consult want_color() before emitting colorsjk/ref-filter-colorsJeff King2017-07-131-0/+1
| * | | | | | | | | rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-131-0/+1
| * | | | | | | | | for-each-ref: load config earlierJeff King2017-07-131-3/+2
| * | | | | | | | | color: check color.ui in git_default_config()Jeff King2017-07-134-5/+4
| * | | | | | | | | ref-filter: provide a function for parsing sort optionsJeff King2017-07-131-25/+1
| * | | | | | | | | ref-filter: abstract ref format into its own structJeff King2017-07-134-37/+41
| * | | | | | | | | check return value of verify_ref_format()Jeff King2017-07-133-5/+10
* | | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook'Junio C Hamano2017-07-181-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-121-0/+4
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jc/utf8-fprintf' into maintJunio C Hamano2017-07-101-3/+2
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-132-35/+74
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/fetch cleanup: always set default value for submodule recursingStefan Beller2017-06-271-3/+2
| * | | | | | | | | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-10/+63
| * | | | | | | | | | builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller2017-06-231-9/+10
| * | | | | | | | | | builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller2017-06-231-16/+2
* | | | | | | | | | | Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano2017-07-133-15/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | hashmap.h: compare function has access to a data fieldStefan Beller2017-06-303-15/+24
* | | | | | | | | | | | Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano2017-07-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason2017-06-301-2/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-124-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-104-4/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'kn/ref-filter-branch-list'Junio C Hamano2017-07-121-6/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | branch: set remote color in ref-filter branch immediatelyJeff King2017-07-091-5/+6
| * | | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2017-07-091-2/+3
| * | | | | | | | | | branch: only perform HEAD check for local branchesJeff King2017-07-091-1/+2
View Lorry Controller Status