aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jm/status-ignored-files-list'Junio C Hamano2017-11-13
|\
| * status: add option to show ignored files differentlyJameson Miller2017-10-31
* | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-09
|\ \
| * | diff: make struct diff_flags members lowercaseBrandon Williams2017-11-01
| * | diff: remove DIFF_OPT_CLR macroBrandon Williams2017-11-01
| * | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-01
| * | diff: remove DIFF_OPT_TST macroBrandon Williams2017-11-01
| * | diff: remove touched flagsBrandon Williams2017-11-01
| * | diff: add flag to indicate textconv was set via cmdlineBrandon Williams2017-11-01
| * | diff: convert flags to be stored in bitfieldsBrandon Williams2017-11-01
| * | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-31
| |/
* | Merge branch 'mp/push-pushoption-config'Junio C Hamano2017-11-06
|\ \
| * | builtin/push.c: add push.pushOption configMarius Paliga2017-10-24
| |/
* | Merge branch 'jc/check-ref-format-oor'Junio C Hamano2017-11-06
|\ \
| * | check-ref-format --branch: strip refs/heads/ using skip_prefixJunio C Hamano2017-10-18
* | | Merge branch 'bc/object-id'Junio C Hamano2017-11-06
|\ \ \
| * | | refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-16
| * | | worktree: convert struct worktree to object_idbrian m. carlson2017-10-16
| * | | refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-16
| * | | refs: convert reflog_expire parameter to struct object_idbrian m. carlson2017-10-16
| * | | refs: convert read_ref_at to struct object_idbrian m. carlson2017-10-16
| * | | refs: convert peel_ref to struct object_idbrian m. carlson2017-10-16
| * | | builtin/pack-objects: convert to struct object_idbrian m. carlson2017-10-16
| * | | pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson2017-10-16
| * | | refs: convert dwim_log to struct object_idbrian m. carlson2017-10-16
| * | | builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson2017-10-16
| * | | refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-16
| * | | refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-16
| * | | refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-16
| * | | Convert check_connected to use struct object_idbrian m. carlson2017-10-16
| * | | refs: update ref transactions to use struct object_idbrian m. carlson2017-10-16
| * | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
| * | | refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-16
* | | | Merge branch 'wk/pull-signoff'Junio C Hamano2017-11-06
|\ \ \ \
| * | | | pull: pass --signoff/--no-signoff to "git merge"W. Trevor King2017-10-13
| |/ / /
* | | | Merge branch 'pc/submodule-helper'Junio C Hamano2017-11-06
|\ \ \ \
| * | | | submodule: port submodule subcommand 'status' from shell to CPrathamesh Chavan2017-10-07
| * | | | submodule--helper: introduce for_each_listed_submodule()Prathamesh Chavan2017-10-07
| * | | | submodule--helper: introduce get_submodule_displaypath()Prathamesh Chavan2017-10-02
* | | | | Merge branch 'pb/bisect-helper'Junio C Hamano2017-11-06
|\ \ \ \ \
| * | | | | bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in CPranit Bauva2017-10-06
| * | | | | bisect--helper: `bisect_clean_state` shell function in CPranit Bauva2017-10-06
| * | | | | bisect--helper: `write_terms` shell function in CPranit Bauva2017-10-06
| * | | | | bisect--helper: rewrite `check_term_format` shell function in CPranit Bauva2017-10-06
| * | | | | bisect--helper: use OPT_CMDMODE instead of OPT_BOOLPranit Bauva2017-10-06
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-06
|\ \ \ \ \ \
| * | | | | | grep: take the read-lock when adding a submoduleMartin Ă…gren2017-11-02
* | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result'Junio C Hamano2017-11-06
|\ \ \ \ \ \ \
| * | | | | | | commit: check result of resolve_ref_unsafeAndrey Okoshkin2017-10-21
| * | | | | | | Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-18
| |\ \ \ \ \ \ \