aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-22
|\
| * parse_decoration_style: drop unused argument `var`Martin Ågren2017-08-07
| * treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-07
* | Merge branch 'bw/clone-recursive-quiet'Junio C Hamano2017-08-22
|\ \
| * | 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 'bw/grep-recurse-submodules'Junio C Hamano2017-08-22
|\ \ \ \
| * | | | grep: recurse in-process using 'struct repository'Brandon Williams2017-08-02
| * | | | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-02
| * | | | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-02
| * | | | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-02
* | | | | Merge branch 'pw/sequence-rerere-autoupdate'Junio C Hamano2017-08-22
|\ \ \ \ \
| * | | | | 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'Junio C Hamano2017-08-22
|\ \ \ \ \ \
| * | | | | | submodule--helper: teach push-check to handle HEADBrandon Williams2017-07-20
* | | | | | | Merge branch 'ma/pager-per-subcommand-action'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \
| * | | | | | | 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'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \
| * | | | | | | rev-list: don't show usage when we see empty ref patternsJeff King2017-08-02
| |/ / / / / /
* | | | | | | Merge branch 'dc/fmt-merge-msg-microcleanup'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \
| * | | | | | | fmt-merge-msg: fix coding styleDimitrios Christidis2017-07-25
* | | | | | | | Merge branch 'js/run-process-parallel-api-fix'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \
| * | | | | | | | run_processes_parallel: change confusing task_cb conventionJohannes Schindelin2017-07-21
* | | | | | | | | Merge branch 'ks/commit-abort-on-empty-message-fix'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit: check for empty message before the check for untouched templateKaartic Sivaraam2017-07-17
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/hashmap-cleanup'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/describe: drop hashmap_cmp_fn castStefan Beller2017-07-05
| * | | | | | | | | builtin/difftool.c: drop hashmap_cmp_fn castStefan Beller2017-07-05
* | | | | | | | | | Merge branch 'jk/reflog-walk'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 'ls/filter-process-delayed'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | convert: add "status=delayed" to filter process protocolLars Schneider2017-06-30
* | | | | | | | | | | | Merge branch 'rs/pack-objects-pbase-cleanup'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | pack-objects: remove unnecessary NULL checkRené Scharfe2017-07-20
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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 'jt/fsck-code-cleanup'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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 'jk/c99'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clean.c: use designated initializerJunio C Hamano2017-07-18
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/ref-filter-colors'Junio C Hamano2017-08-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ref-filter: consult want_color() before emitting colorsJeff King2017-07-13
| * | | | | | | | | | | | | | rev-list: pass diffopt->use_colors through to pretty-printJeff King2017-07-13
| * | | | | | | | | | | | | | for-each-ref: load config earlierJeff King2017-07-13