git/builtin, branch v2.5.0

Merge branch 'es/worktree-add'

2015-07-13T21:02:19Z

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 is omitted worktree: add: make -b/-B default to HEAD when 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 ...

Merge branch 'nd/multiple-work-trees'

2015-07-13T21:02:02Z

"git checkout [] " spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary

Merge branch 'ss/clone-guess-dir-name-simplify'

2015-07-13T21:00:28Z

Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name()

Revert "checkout: retire --ignore-other-worktrees in favor of --force"

2015-07-12T16:38:21Z

This reverts commit 0d1a1517835a10818f2d40d8780a268dbb5e20ce. When trying to switch to a different branch, that happens to be checked out in another working tree, the user shouldn't have to give up the other safety measures (like protecting the local changes that overlap the difference between the branches) while defeating the "no two checkouts of the same branch" safety. Signed-off-by: Junio C Hamano

Merge branch 'ls/hint-rev-list-count'

2015-07-10T21:26:13Z

* ls/hint-rev-list-count: rev-list: add --count to usage guide

Merge branch 'jk/rev-list-no-bitmap-while-pruning'

2015-07-10T21:26:12Z

A minor bugfix when pack bitmap is used with "rev-list --count". * jk/rev-list-no-bitmap-while-pruning: rev-list: disable --use-bitmap-index when pruning commits

Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'

2015-07-09T21:31:42Z

A hotfix for what is in 2.5-rc but not in 2.4. * jc/fix-alloc-sortbuf-in-index-pack: index-pack: fix allocation of sorted_by_pos array

clone: simplify string handling in guess_dir_name()

2015-07-09T21:21:29Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

checkout: retire --ignore-other-worktrees in favor of --force

2015-07-07T21:34:46Z

As a safeguard, checking out a branch already checked out by a different worktree is disallowed. This behavior can be overridden with --ignore-other-worktrees, however, this option is neither obvious nor particularly discoverable. As a common safeguard override, --force is more likely to come to mind. Therefore, overload it to also suppress the check for a branch already checked out elsewhere. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

worktree: add: auto-vivify new branch when is omitted

2015-07-07T21:34:32Z

As a convenience, when is omitted from "git worktree " and neither -b nor -B is used, automatically create a new branch named after , as if "-b $(basename )" was specified. Thus, "git worktree add ../hotfix" creates a new branch named "hotfix" and associates it with new worktree "../hotfix". Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano