summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-031-1/+1
|\
| * ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-201-1/+1
* | 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
| * | checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy2014-12-011-2/+84
| * | prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy2014-12-011-2/+17
| * | checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy2014-12-011-2/+93
| * | git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy2014-12-011-5/+8
| * | path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy2014-12-011-1/+1
* | | checkout: call a single commit "it" intead of "them"ts/checkout-advice-pluralThomas Schneider2015-04-021-2/+9
| |/ |/|
* | standardize usage info string formatAlex Henrie2015-01-141-4/+4
* | Merge branch 'nd/ls-tree-pathspec'Junio C Hamano2014-12-221-4/+4
|\ \
| * | tree.c: update read_tree_recursive callback to pass strbuf as baseNguyễn Thái Ngọc Duy2014-12-011-4/+4
| |/
* | Merge branch 'jk/checkout-from-tree'Junio C Hamano2014-12-051-0/+18
|\ \ | |/ |/|
| * checkout $tree: do not throw away unchanged index entriesjk/checkout-from-treeJeff King2014-11-131-0/+18
* | refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg2014-10-151-3/+3
* | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-141-4/+2
|\ \
| * | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-4/+2
* | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-1/+1
|/ /
* | Merge branch 'dt/cache-tree-repair'Junio C Hamano2014-09-111-0/+6
|\ \
| * | cache-tree: create/update cache-tree on checkoutDavid Turner2014-07-071-0/+8
* | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-7/+5
|\ \ \
| * | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-131-0/+1
| * | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-7/+4
| |/ /
* | | use skip_prefix to avoid repeating stringsJeff King2014-06-201-2/+2
* | | Merge branch 'rs/reflog-exists'Junio C Hamano2014-06-061-6/+2
|\ \ \
| * | | checkout.c: use ref_exists instead of file_existrs/reflog-existsRonnie Sahlberg2014-05-081-4/+1
| * | | refs.c: add new functions reflog_exists and delete_reflogRonnie Sahlberg2014-05-081-4/+3
| |/ /
* | | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-031-1/+1
|\ \ \ | |/ / |/| |
| * | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-071-1/+1
* | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-1/+1
|\ \ \
| * | | comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
View Lorry Controller Status