| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ |
|
| * | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | Merge branch 'sb/submodule-blanket-recursive' | Junio C Hamano | 2017-06-13 | 1 | -28/+3 |
|\ \ |
|
| * | | Introduce 'submodule.recurse' option for worktree manipulators | Stefan Beller | 2017-06-01 | 1 | -1/+1 |
| * | | reset/checkout/read-tree: unify config callback for submodule recursion | Stefan Beller | 2017-05-30 | 1 | -26/+1 |
| * | | submodule recursing: do not write a config variable twice | Stefan Beller | 2017-05-30 | 1 | -1/+1 |
* | | | Merge branch 'ja/do-not-ask-needless-questions' | Junio C Hamano | 2017-05-29 | 1 | -3/+2 |
|\ \ \ |
|
| * | | | usability: don't ask questions if no reply is required | Jean-Noel Avila | 2017-05-12 | 1 | -3/+2 |
* | | | | Merge branch 'js/plug-leaks' | Junio C Hamano | 2017-05-29 | 1 | -8/+10 |
|\ \ \ \ |
|
| * | | | | checkout: fix memory leakjs/plug-leaks | Junio C Hamano | 2017-05-09 | 1 | -0/+1 |
| * | | | | checkout: fix memory leak | Johannes Schindelin | 2017-05-08 | 1 | -8/+9 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-05-29 | 1 | -9/+9 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | tree: convert parse_tree_indirect to struct object_id | brian m. carlson | 2017-05-08 | 1 | -4/+4 |
| * | | | revision: rename add_pending_sha1 to add_pending_oid | brian m. carlson | 2017-05-08 | 1 | -2/+2 |
| * | | | Convert lookup_commit* to struct object_id | brian m. carlson | 2017-05-08 | 1 | -3/+3 |
| |/ / |
|
* | | | Merge branch 'rs/checkout-am-fix-unborn' | Junio C Hamano | 2017-05-23 | 1 | -1/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | checkout: check return value of resolve_refdup before using hash | René Scharfe | 2017-05-08 | 1 | -1/+2 |
| |/ |
|
| * | Merge branch 'jk/interpret-branch-name' into maint | Junio C Hamano | 2017-03-28 | 1 | -1/+1 |
| |\ |
|
* | | | avoid using fixed PATH_MAX buffers for refs | Jeff King | 2017-03-30 | 1 | -3/+2 |
* | | | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-03-28 | 1 | -0/+28 |
|\ \ \ |
|
| * | | | builtin/checkout: add --recurse-submodules switch | Stefan Beller | 2017-03-16 | 1 | -0/+28 |
| |/ / |
|
* | | | Merge branch 'jk/interpret-branch-name' | Junio C Hamano | 2017-03-14 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | checkout: restrict @-expansions when finding branchjk/interpret-branch-name | Jeff King | 2017-03-02 | 1 | -1/+1 |
| * | interpret_branch_name: allow callers to restrict expansions | Jeff King | 2017-03-02 | 1 | -1/+1 |
* | | Merge branch 'cw/log-updates-for-all-refs-really' | Junio C Hamano | 2017-02-03 | 1 | -4/+7 |
|\ \ |
|
| * | | refs: add option core.logAllRefUpdates = always | Cornelius Weig | 2017-01-31 | 1 | -4/+7 |
* | | | checkout: convert post_checkout_hook() to struct object_id | René Scharfe | 2017-01-30 | 1 | -2/+2 |
|/ / |
|
* | | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 1 | -2/+2 |
|/ |
|
* | Merge branch 'jk/create-branch-remove-unused-param' | Junio C Hamano | 2016-11-17 | 1 | -1/+1 |
|\ |
|
| * | create_branch: drop unused "head" parameterjk/create-branch-remove-unused-param | Jeff King | 2016-11-09 | 1 | -1/+1 |
| * | Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint | Junio C Hamano | 2016-09-08 | 1 | -2/+1 |
| |\ |
|
* | \ | Merge branch 'rs/checkout-init-macro' | Junio C Hamano | 2016-09-26 | 1 | -2/+1 |
|\ \ \ |
|
| * | | | introduce CHECKOUT_INITrs/checkout-init-macro | René Scharfe | 2016-09-22 | 1 | -2/+1 |
* | | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-09-26 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 1 | -1/+1 |
* | | | | | Merge branch 'nd/checkout-disambiguation' | Junio C Hamano | 2016-09-26 | 1 | -3/+3 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguation | Nguyễn Thái Ngọc Duy | 2016-09-21 | 1 | -2/+2 |
| * | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 | 1 | -1/+1 |
* | | | | | Merge branch 'rs/checkout-some-states-are-const' | Junio C Hamano | 2016-09-21 | 1 | -3/+3 |
|\ \ \ \ \ |
|
| * | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-const | René Scharfe | 2016-09-13 | 1 | -3/+3 |
* | | | | | | sha1_name: convert get_sha1_mb to struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+1 |
* | | | | | | Convert read_mmblob to take struct object_id. | brian m. carlson | 2016-09-07 | 1 | -3/+3 |
* | | | | | | builtin/checkout: convert some static functions to struct object_id | brian m. carlson | 2016-09-07 | 1 | -33/+33 |
* | | | | | | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -3/+3 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge branch 'sb/checkout-explit-detach-no-advice' | Junio C Hamano | 2016-08-19 | 1 | -1/+2 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-advice | Stefan Beller | 2016-08-15 | 1 | -1/+2 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'rs/use-strbuf-add-unique-abbrev' | Junio C Hamano | 2016-08-12 | 1 | -2/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrev | René Scharfe | 2016-08-06 | 1 | -2/+1 |
| |/ / |
|
* | | | merge_trees(): ensure that the callers release output buffer | Johannes Schindelin | 2016-08-01 | 1 | -0/+1 |
* | | | prepare the builtins for a libified merge_recursive() | Johannes Schindelin | 2016-07-26 | 1 | -1/+3 |