summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* bisect: mention "view" as an alternative to "visualize"rd/bisect-view-is-visualizeRobert P. J. Day2017-11-131-1/+1
* Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-0910-37/+37
|\
| * diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-019-34/+34
| * diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-011-1/+1
| * diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-017-20/+20
| * diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-015-11/+11
| * diff: remove touched flagsBrandon Williams2017-11-011-2/+0
| * diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-011-1/+1
| * diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-012-4/+6
| * add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-312-2/+2
* | Merge branch 'mp/push-pushoption-config'Junio C Hamano2017-11-061-5/+21
|\ \
| * | builtin/push.c: add push.pushOption configmp/push-pushoption-configMarius Paliga2017-10-241-5/+21
| |/
* | Merge branch 'jc/check-ref-format-oor'Junio C Hamano2017-11-061-2/+4
|\ \
| * | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-181-2/+4
* | | Merge branch 'bc/object-id'Junio C Hamano2017-11-0630-179/+179
|\ \ \
| * | | refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-161-1/+1
| * | | worktree: convert struct worktree to object_idbrian m. carlson2017-10-161-3/+3
| * | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | refs: convert reflog_expire parameter to struct object_idbrian m. carlson2017-10-161-3/+3
| * | | refs: convert read_ref_at to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | refs: convert peel_ref to struct object_idbrian m. carlson2017-10-163-4/+4
| * | | builtin/pack-objects: convert to struct object_idbrian m. carlson2017-10-161-67/+68
| * | | pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson2017-10-162-6/+6
| * | | refs: convert dwim_log to struct object_idbrian m. carlson2017-10-161-2/+2
| * | | builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson2017-10-161-9/+9
| * | | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-166-6/+6
| * | | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-166-12/+12
| * | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-169-13/+13
| * | | Convert check_connected to use struct object_idbrian m. carlson2017-10-163-9/+9
| * | | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-167-13/+13
| * | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-168-31/+30
| * | | refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-165-5/+5
* | | | Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-061-0/+6
|\ \ \ \
| * | | | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-131-0/+6
| |/ / /
* | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-11-061-17/+256
|\ \ \ \
| * | | | submodule: port submodule subcommand 'status' from shell to CPrathamesh Chavan2017-10-071-0/+198
| * | | | submodule--helper: introduce for_each_listed_submodule()Prathamesh Chavan2017-10-071-5/+35
| * | | | submodule--helper: introduce get_submodule_displaypath()Prathamesh Chavan2017-10-021-12/+23
* | | | | Merge branch 'pb/bisect-helper'Junio C Hamano2017-11-061-6/+131
|\ \ \ \ \
| * | | | | bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in Cpb/bisect-helperPranit Bauva2017-10-061-1/+33
| * | | | | bisect--helper: `bisect_clean_state` shell function in CPranit Bauva2017-10-061-1/+9
| * | | | | bisect--helper: `write_terms` shell function in CPranit Bauva2017-10-061-7/+29
| * | | | | bisect--helper: rewrite `check_term_format` shell function in CPranit Bauva2017-10-061-1/+59
| * | | | | bisect--helper: use OPT_CMDMODE instead of OPT_BOOLPranit Bauva2017-10-061-6/+11
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-061-0/+2
|\ \ \ \ \ \
| * | | | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result'Junio C Hamano2017-11-061-0/+2
|\ \ \ \ \ \ \
| * | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
| * | | | | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-186-5/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-181-2/+3
| |\ \ \ \ \ \ \ \
View Lorry Controller Status