Junio C Hamano 799767cc98 Merge branch 'es/worktree-add' ... Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". * es/worktree-add: (24 commits) Revert "checkout: retire --ignore-other-worktrees in favor of --force" checkout: retire --ignore-other-worktrees in favor of --force worktree: add: auto-vivify new branch when <branch> is omitted worktree: add: make -b/-B default to HEAD when <branch> is omitted worktree: extract basename computation to new function checkout: require worktree unconditionally checkout: retire --to option tests: worktree: retrofit "checkout --to" tests for "worktree add" worktree: add -b/-B options worktree: add --detach option worktree: add --force option worktree: introduce "add" command checkout: drop 'checkout_opts' dependency from prepare_linked_checkout checkout: make --to unconditionally verbose checkout: prepare_linked_checkout: drop now-unused 'new' argument checkout: relocate --to's "no branch specified" check checkout: fix bug with --to and relative HEAD Documentation/git-worktree: add EXAMPLES section Documentation/git-worktree: add high-level 'lock' overview Documentation/git-worktree: split technical info from general description ...		2015-07-13 14:02:19 -07:00
..
add.c	Merge branch 'nd/diff-i-t-a'	2015-06-25 10:47:46 -07:00
annotate.c
apply.c	Merge branch 'jc/apply-reject-noop-hunk'	2015-06-24 12:21:39 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'qn/blame-show-email'	2015-06-24 12:21:41 -07:00
branch.c	Merge branch 'bc/object-id'	2015-06-05 12:17:37 -07:00
bundle.c	bundle: verify arguments more strictly	2015-05-08 10:52:11 -07:00
cat-file.c	Merge branch 'dt/cat-file-follow-symlinks'	2015-06-01 12:45:16 -07:00
check-attr.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ignore.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-mailmap.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
check-ref-format.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
checkout-index.c	prefix_path(): unconditionally free results in the callers	2015-05-05 10:31:51 -07:00
checkout.c	Merge branch 'es/worktree-add'	2015-07-13 14:02:19 -07:00
clean.c	Merge branch 'rs/janitorial' into maint	2015-06-16 14:33:47 -07:00
clone.c	Merge branch 'ss/clone-guess-dir-name-simplify'	2015-07-13 14:00:28 -07:00
column.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
commit-tree.c	commit-tree: simplify parsing of option -S using skip_prefix()	2014-12-29 09:32:45 -08:00
commit.c	Merge branch 'pt/xdg-config-path' into maint	2015-06-05 12:00:04 -07:00
config.c	Merge branch 'pt/xdg-config-path' into maint	2015-06-05 12:00:04 -07:00
count-objects.c
credential.c
describe.c	get_name(): rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
diff-files.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff-tree.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
diff.c
fast-export.c
fetch-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
fetch.c	builtin/fetch: rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
fmt-merge-msg.c	Merge branch 'jc/plug-fmt-merge-msg-leak' into maint	2015-06-05 12:00:05 -07:00
for-each-ref.c	Merge branch 'mh/reporting-broken-refs-from-for-each-ref'	2015-06-24 12:21:52 -07:00
fsck.c	Merge branch 'mh/fsck-reflog-entries'	2015-06-24 12:21:48 -07:00
gc.c	Merge branch 'nd/multiple-work-trees'	2015-07-13 14:02:02 -07:00
get-tar-commit-id.c
grep.c	Merge branch 'ps/grep-help-all-callback-arg'	2015-04-20 15:28:34 -07:00
hash-object.c	Merge branch 'jc/hash-object' into maint	2015-05-26 13:49:25 -07:00
help.c	Merge branch 'sb/leaks'	2015-03-20 13:11:53 -07:00
index-pack.c	Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'	2015-07-09 14:31:42 -07:00
init-db.c	Merge branch 'jk/init-core-worktree-at-root' into maint	2015-05-13 14:05:49 -07:00
interpret-trailers.c
log.c	Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'	2015-06-24 12:21:40 -07:00
ls-files.c	Merge branch 'jc/report-path-error-to-dir' into maint	2015-03-31 14:53:08 -07:00
ls-remote.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
ls-tree.c
mailinfo.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
mailsplit.c
merge-base.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-file.c	Merge branch 'ab/merge-file-prefix'	2015-02-22 12:28:25 -08:00
merge-index.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'jk/at-push-sha1'	2015-06-05 12:17:36 -07:00
mktag.c
mktree.c
mv.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
name-rev.c	name_ref(): rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
notes.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-objects.c	Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint	2015-06-05 12:00:07 -07:00
pack-redundant.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
pack-refs.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
patch-id.c	patch-id: convert to use struct object_id	2015-03-13 22:43:14 -07:00
prune-packed.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
prune.c	Merge branch 'nd/multiple-work-trees'	2015-07-13 14:02:02 -07:00
push.c	push: allow --follow-tags to be set by config push.followTags	2015-03-14 15:08:35 -07:00
read-tree.c
receive-pack.c	show_ref_cb(): rewrite to take an object_id argument	2015-05-25 12:19:29 -07:00
reflog.c	builtin/reflog: rewrite ref functions to take an object_id argument	2015-05-25 12:19:30 -07:00
remote-ext.c
remote-fd.c
remote.c	builtin/remote: rewrite functions to take object_id arguments	2015-05-25 12:19:30 -07:00
repack.c	Merge branch 'nd/multiple-work-trees'	2015-05-11 14:23:39 -07:00
replace.c	show_reference(): rewrite to take an object_id argument	2015-05-25 12:19:30 -07:00
rerere.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
reset.c
rev-list.c	Merge branch 'ls/hint-rev-list-count'	2015-07-10 14:26:13 -07:00
rev-parse.c	builtin/rev-parse: rewrite to take an object_id argument	2015-05-25 12:19:27 -07:00
revert.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
rm.c	use file_exists() to check if a file exists in the worktree	2015-05-20 13:49:10 -07:00
send-pack.c	send-pack.c: add --atomic command line argument	2015-01-07 19:56:44 -08:00
shortlog.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
show-branch.c	cmd_show_branch(): fix error message	2015-05-25 12:19:31 -07:00
show-ref.c	show_ref(): convert local variable peeled to object_id	2015-05-25 12:19:32 -07:00
stripspace.c
symbolic-ref.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
tag.c	builtin/show-ref: rewrite to take an object_id argument	2015-05-25 12:19:33 -07:00
unpack-file.c
unpack-objects.c
update-index.c	Merge branch 'nd/untracked-cache'	2015-05-26 13:24:46 -07:00
update-ref.c	ref_transaction_verify(): new function to check a reference's value	2015-02-17 11:24:59 -08:00
update-server-info.c
upload-archive.c
var.c
verify-commit.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-pack.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
verify-tag.c	standardize usage info string format	2015-01-14 09:32:04 -08:00
worktree.c	Merge branch 'es/worktree-add'	2015-07-13 14:02:19 -07:00
write-tree.c