Merge branch 'es/worktree-add'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2015 21:02:18 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2015 21:02:19 +0000 (14:02 -0700)
commit799767cc98b2f8e6f82d0de4bef9b5e8fcc16e97
tree6b4292f1c30feec0958156c66c1a724dc067be9e
parent7783eb2e59684492e75068443e1f77f64fe37cc9
parentc925fe23684455735c3bb1903803643a24a58d8f
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
  ...
Documentation/git-checkout.txt
builtin/checkout.c
builtin/worktree.c
git.c