summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ | |/|
* | | Merge branch 'es/worktree-add-cleanup'Junio C Hamano2015-08-121-76/+6
|\ \ \
| * | | checkout: drop intimate knowledge of newly created worktreeEric Sunshine2015-07-201-7/+2
| * | | branch: publish die_if_checked_out()Eric Sunshine2015-07-201-67/+0
| * | | checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine2015-07-201-1/+5
| * | | checkout: check_linked_checkout: simplify symref parsingEric Sunshine2015-07-201-9/+6
| * | | checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine2015-07-201-0/+1
| * | | checkout: generalize die_if_checked_out() branch name argumentEric Sunshine2015-07-201-7/+8
| * | | checkout: die_if_checked_out: simplify strbuf managementEric Sunshine2015-07-201-4/+3
| * | | checkout: improve die_if_checked_out() robustnessEric Sunshine2015-07-201-7/+7
| * | | checkout: name check_linked_checkouts() more meaningfullyEric Sunshine2015-07-201-2/+2
| * | | checkout: avoid resolving HEAD unnecessarilyEric Sunshine2015-07-201-3/+3
* | | | Merge branch 'dt/refs-backend-preamble'Junio C Hamano2015-08-031-12/+10
|\ \ \ \
| * | | | refs: new public ref function: safe_create_reflogDavid Turner2015-07-211-9/+5
| * | | | refs.c: add err arguments to reflog functionsDavid Turner2015-07-211-3/+5
* | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-131-153/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-121-3/+5
| * | | | checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-071-5/+3
| * | | | checkout: require worktree unconditionallyEric Sunshine2015-07-061-2/+0
| * | | | checkout: retire --to optionEric Sunshine2015-07-061-160/+1
| * | | | checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine2015-07-061-4/+5
| * | | | checkout: make --to unconditionally verboseEric Sunshine2015-07-061-2/+1
| * | | | checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine2015-07-061-3/+2
| * | | | checkout: relocate --to's "no branch specified" checkEric Sunshine2015-07-061-3/+4
| * | | | checkout: fix bug with --to and relative HEADEric Sunshine2015-07-061-4/+12
* | | | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-07-131-12/+11
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | checkout: don't check worktrees when not necessaryNguyễn Thái Ngọc Duy2015-06-121-12/+11
* | | | add_pending_uninteresting_ref(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-5/+3
* | | | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-1/+3
| |_|/ |/| |
* | | Merge branch 'nd/multiple-work-trees'Junio C Hamano2015-05-111-12/+257
|\ \ \ | |/ /
| * | checkout: add --ignore-other-wortreesNguyễn Thái Ngọc Duy2015-01-071-1/+5
| * | checkout: pass whole struct to parse_branchname_arg instead of individual flagsNguyễn Thái Ngọc Duy2015-01-071-7/+6
| * | checkout: do not fail if target is an empty directoryMax Kirillov2014-12-011-1/+1
| * | checkout: don't require a work tree when checking out into a new oneDennis Kaarsemaker2014-12-011-0/+3
| * | checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy2014-12-011-0/+48