aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano2016-09-21
|\
| * checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe2016-09-13
* | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-21
|\ \
| * | init: reset cached config when entering new repoJeff King2016-09-13
| * | init: expand comments explaining config trickeryJeff King2016-09-13
| * | diff: always try to set up the repositoryJeff King2016-09-13
| * | diff: skip implicit no-index check when given --no-indexJeff King2016-09-13
| * | hash-object: always try to set up the git repositoryJeff King2016-09-13
| |/
* | Merge branch 'ks/pack-objects-bitmap'Junio C Hamano2016-09-21
|\ \
| * | pack-objects: use reachability bitmap index when generating non-stdout packKirill Smelkov2016-09-12
| * | pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is ...Kirill Smelkov2016-09-12
* | | Merge branch 'js/cat-file-filters'Junio C Hamano2016-09-21
|\ \ \
| * | | cat-file: support --textconv/--filters in batch modeJohannes Schindelin2016-09-11
| * | | cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin2016-09-11
| * | | cat-file: introduce the --filters optionJohannes Schindelin2016-09-11
* | | | Merge branch 'bc/object-id'Junio C Hamano2016-09-19
|\ \ \ \
| * | | | builtin/reset: convert to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/commit-tree: convert to struct object_idbrian m. carlson2016-09-07
| * | | | builtin/am: convert to struct object_idbrian m. carlson2016-09-07
| * | | | sha1_name: convert get_sha1_mb to struct object_idbrian m. carlson2016-09-07
| * | | | builtin/update-index: convert file to struct object_idbrian m. carlson2016-09-07
| * | | | builtin/rm: convert to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/blame: convert file to use struct object_idbrian m. carlson2016-09-07
| * | | | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-07
| * | | | builtin/checkout: convert some static functions to struct object_idbrian m. carlson2016-09-07
| * | | | streaming: make stream_blob_to_fd take struct object_idbrian m. carlson2016-09-07
| * | | | builtin: convert textconv_object to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/cat-file: convert some static functions to struct object_idbrian m. carlson2016-09-07
| * | | | builtin/cat-file: convert struct expand_data to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/log: convert some static functions to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/blame: convert struct origin to use struct object_idbrian m. carlson2016-09-07
| * | | | builtin/apply: convert static functions to struct object_idbrian m. carlson2016-09-07
| * | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-07
* | | | | Merge branch 'mh/ref-store'Junio C Hamano2016-09-19
|\ \ \ \ \
| * | | | | refs: add methods to init refs dbDavid Turner2016-09-09
* | | | | | Merge branch 'cc/apply-am'Junio C Hamano2016-09-19
|\ \ \ \ \ \
| * | | | | | builtin/am: use apply API in run_apply()Christian Couder2016-09-07
| * | | | | | apply: refactor `git apply` option parsingChristian Couder2016-09-07
| * | | | | | apply: make it possible to silently applyChristian Couder2016-09-07
| * | | | | | apply: move libified code from builtin/apply.c to apply.{c,h}Christian Couder2016-09-07
| * | | | | | apply: rename and move opt constants to apply.hChristian Couder2016-09-07
| * | | | | | builtin/apply: rename option parsing functionsChristian Couder2016-09-07
| * | | | | | builtin/apply: make create_one_file() return -1 on errorChristian Couder2016-09-07
| * | | | | | builtin/apply: make try_create_file() return -1 on errorChristian Couder2016-09-07
| * | | | | | builtin/apply: make write_out_results() return -1 on errorChristian Couder2016-08-11
| * | | | | | builtin/apply: make write_out_one_result() return -1 on errorChristian Couder2016-08-11
| * | | | | | builtin/apply: make create_file() return -1 on errorChristian Couder2016-08-11
| * | | | | | builtin/apply: make add_index_file() return -1 on errorChristian Couder2016-08-11
| * | | | | | builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder2016-08-11
| * | | | | | builtin/apply: make remove_file() return -1 on errorChristian Couder2016-08-11