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


Trivial merge