summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-03-281-0/+28
|\
| * builtin/checkout: add --recurse-submodules switchStefan Beller2017-03-161-0/+28
* | Merge branch 'jk/interpret-branch-name'Junio C Hamano2017-03-141-1/+1
|\ \ | |/ |/|
| * checkout: restrict @-expansions when finding branchjk/interpret-branch-nameJeff King2017-03-021-1/+1
| * interpret_branch_name: allow callers to restrict expansionsJeff King2017-03-021-1/+1
* | Merge branch 'cw/log-updates-for-all-refs-really'Junio C Hamano2017-02-031-4/+7
|\ \
| * | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-311-4/+7
* | | checkout: convert post_checkout_hook() to struct object_idRené Scharfe2017-01-301-2/+2
|/ /
* | hold_locked_index(): align error handling with hold_lockfile_for_update()Junio C Hamano2016-12-071-2/+2
|/
* Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano2016-11-171-1/+1
|\
| * create_branch: drop unused "head" parameterjk/create-branch-remove-unused-paramJeff King2016-11-091-1/+1
| * Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-081-2/+1
| |\
* | \ Merge branch 'rs/checkout-init-macro'Junio C Hamano2016-09-261-2/+1
|\ \ \
| * | | introduce CHECKOUT_INITrs/checkout-init-macroRené Scharfe2016-09-221-2/+1
* | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-09-261-1/+1
|\ \ \ \
| * | | | add: modify already added files when --chmod is givenThomas Gummerer2016-09-151-1/+1
* | | | | Merge branch 'nd/checkout-disambiguation'Junio C Hamano2016-09-261-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-211-2/+2
| * | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-081-1/+1
* | | | | Merge branch 'rs/checkout-some-states-are-const'Junio C Hamano2016-09-211-3/+3
|\ \ \ \ \
| * | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-constRené Scharfe2016-09-131-3/+3
* | | | | | sha1_name: convert get_sha1_mb to struct object_idbrian m. carlson2016-09-071-1/+1
* | | | | | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-3/+3
* | | | | | builtin/checkout: convert some static functions to struct object_idbrian m. carlson2016-09-071-33/+33
* | | | | | cache: convert struct cache_entry to use struct object_idbrian m. carlson2016-09-071-3/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-1/+2
| | |/ / | |/| |
* | | | Merge branch 'rs/use-strbuf-add-unique-abbrev'Junio C Hamano2016-08-121-2/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | use strbuf_add_unique_abbrev() for adding short hashesrs/use-strbuf-add-unique-abbrevRené Scharfe2016-08-061-2/+1
| |/ /
* | | merge_trees(): ensure that the callers release output bufferJohannes Schindelin2016-08-011-0/+1
* | | prepare the builtins for a libified merge_recursive()Johannes Schindelin2016-07-261-1/+3
* | | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-3/+3
|\ \ \ | |/ / |/| |
| * | i18n: standardise messagesVasco Almeida2016-06-171-3/+3
* | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-071-1/+1
|/ /
* | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-1/+1
|\ \
| * | worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-1/+1
| |/
* | checkout_paths(): remove unneeded flag variableMichael Haggerty2016-04-101-2/+1
|/
* builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-1/+1
* Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2016-02-241-1/+2
|\
| * check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-101-1/+2
| * checkout: reorder check_filename conditionalJeff King2016-02-101-1/+1
* | checkout,clone: check return value of create_symrefJeff King2016-01-121-1/+2
* | Remove get_object_hash.brian m. carlson2015-11-201-5/+5
* | Convert struct object to object_idbrian m. carlson2015-11-201-6/+6
* | Add several uses of get_object_hash.brian m. carlson2015-11-201-5/+5
* | checkout: add --progress optionea/checkout-progressEdmundo Carmona Antoranz2015-11-011-2/+12
* | Merge branch 'hv/submodule-config'Junio C Hamano2015-08-311-0/+1
|\ \
| * | submodule: use new config API for worktree configurationsHeiko Voigt2015-08-191-0/+1
* | | Merge branch 'jc/calloc-pathspec'Junio C Hamano2015-08-261-1/+1
|\ \ \
| * | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-201-1/+1
| | |/ | |/|