Merge branch 'ky/branch-d-worktree' into maint
commita4127142c621c03cb0967d298ac0ea1e673162fd
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:05 +0000 (2 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:05 +0000 (2 14:24 -0700)
treee6383127a5b555b4637c1100da78c0168276623a
parent85916549980c709ae14f8a935a5a6266a4a80b26
parentf292244c04d8109ee32a45016ce08984fbd925f0
Merge branch 'ky/branch-d-worktree' into maint

When "git worktree" feature is in use, "git branch -d" allowed
deletion of a branch that is checked out in another worktree

* ky/branch-d-worktree:
  branch -d: refuse deleting a branch which is currently checked out