Merge branch 'nd/multiple-work-trees'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2015 21:02:02 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Jul 2015 21:02:02 +0000 (14:02 -0700)
"git checkout [<tree-ish>] <paths>" 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

1  2 
.gitignore
Makefile
builtin/checkout.c
builtin/gc.c
builtin/prune.c
command-list.txt
git.c
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge
diff --cc builtin/gc.c
Simple merge
diff --cc builtin/prune.c
Simple merge
Simple merge
diff --cc git.c
Simple merge