From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Jul 2015 21:02:02 +0000 (-0700)
Subject: Merge branch 'nd/multiple-work-trees'
X-Git-Tag: v2.5.0-rc2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7783eb2e59684492e75068443e1f77f64fe37cc9?ds=inline;hp=--cc

Merge branch 'nd/multiple-work-trees'

"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
---

7783eb2e59684492e75068443e1f77f64fe37cc9