summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* ref_store: take a `msg` parameter when deleting referencesMichael Haggerty2017-05-232-3/+3
* Merge branch 'bc/object-id'Junio C Hamano2017-05-2338-311/+331
|\
| * object: convert parse_object* to take struct object_idbrian m. carlson2017-05-0814-23/+26
| * tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-089-17/+17
| * diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-083-5/+5
| * builtin/ls-tree: convert to struct object_idbrian m. carlson2017-05-081-3/+3
| * merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-082-4/+4
| * builtin/ls-files: convert overlay_tree_on_cache to object_idbrian m. carlson2017-05-081-3/+3
| * builtin/read-tree: convert to struct object_idbrian m. carlson2017-05-081-5/+5
| * revision: rename add_pending_sha1 to add_pending_oidbrian m. carlson2017-05-082-3/+3
| * Convert the verify_pack callback to struct object_idbrian m. carlson2017-05-081-3/+3
| * Convert lookup_tag to struct object_idbrian m. carlson2017-05-083-5/+5
| * Convert lookup_tree to struct object_idbrian m. carlson2017-05-084-5/+5
| * builtin/reflog: convert tree_is_complete to take struct object_idbrian m. carlson2017-05-081-5/+5
| * Convert lookup_blob to struct object_idbrian m. carlson2017-05-085-5/+5
| * Convert remaining callers of lookup_blob to object_idbrian m. carlson2017-05-082-19/+19
| * builtin/unpack-objects: convert to struct object_idbrian m. carlson2017-05-081-32/+32
| * pack: convert struct pack_idx_entry to struct object_idbrian m. carlson2017-05-082-40/+56
| * Convert lookup_commit* to struct object_idbrian m. carlson2017-05-0824-53/+54
| * builtin/tag: convert to struct object_idbrian m. carlson2017-05-081-33/+33
| * shallow: convert shallow registration functions to object_idbrian m. carlson2017-05-082-4/+4
| * builtin/verify-commit: convert to struct object_idbrian m. carlson2017-05-081-6/+6
| * reflog_expire: convert to struct object_idbrian m. carlson2017-05-081-11/+11
| * builtin/rev-parse: convert to struct object_idbrian m. carlson2017-05-021-28/+28
| * builtin/blame: convert static function to struct object_idbrian m. carlson2017-05-021-3/+3
| * builtin/prune: convert to struct object_idbrian m. carlson2017-05-021-3/+3
| * builtin/name-rev: convert to struct object_idbrian m. carlson2017-05-021-14/+14
| * Convert struct cache_tree to use struct object_idbrian m. carlson2017-05-022-3/+3
| * Clean up outstanding object_id transforms.brian m. carlson2017-05-021-1/+1
* | Merge branch 'jt/push-options-doc'Junio C Hamano2017-05-231-2/+49
|\ \
| * | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-2/+49
* | | Merge branch 'rs/checkout-am-fix-unborn'Junio C Hamano2017-05-232-2/+3
|\ \ \
| * | | am: check return value of resolve_refdup before using hashrs/checkout-am-fix-unbornRené Scharfe2017-05-081-1/+1
| * | | checkout: check return value of resolve_refdup before using hashRené Scharfe2017-05-081-1/+2
| |/ /
* | | Merge branch 'ah/log-decorate-default-to-auto'Junio C Hamano2017-05-231-2/+2
|\ \ \
| * | | builtin/log: honor log.decorateah/log-decorate-default-to-autobrian m. carlson2017-05-151-2/+2
* | | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-1615-48/+48
|\ \ \ \
| * | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-2713-36/+36
| * | | | PRItime: introduce a new "printf format" for timestampsJohannes Schindelin2017-04-236-9/+9
| * | | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-232-3/+3
* | | | | Merge branch 'jn/clone-add-empty-config-from-command-line'Junio C Hamano2017-05-161-1/+3
|\ \ \ \ \
| * | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-1/+3
* | | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-161-2/+11
|\ \ \ \ \ \
| * | | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-011-2/+11
* | | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-161-0/+4
|\ \ \ \ \ \ \
| * | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-281-0/+4
* | | | | | | | Merge branch 'jk/am-leakfix'Junio C Hamano2017-05-161-20/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | am: shorten ident_split variable name in get_commit_info()jk/am-leakfixJeff King2017-04-271-11/+9
| * | | | | | | | am: simplify allocations in get_commit_info()Jeff King2017-04-271-15/+10
| * | | | | | | | am: fix commit buffer leak in get_commit_info()Jeff King2017-04-271-0/+1
| | |_|/ / / / / | |/| | | | | |