Skip to content
  • Junio C Hamano's avatar
    Merge branch 'es/worktree-add' · 799767cc
    Junio C Hamano authored
    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
      ...
    799767cc