Merge branch 'ky/branch-m-worktree'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:48:11 +0000 (10:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:48:11 +0000 (10:48 -0700)
When "git worktree" feature is in use, "git branch -m" renamed a
branch that is checked out in another worktree without adjusting
the HEAD symbolic ref for the worktree.

* ky/branch-m-worktree:
set_worktree_head_symref(): fix error message
branch -m: update all per-worktree HEADs
refs: add a new function set_worktree_head_symref

1  2 
builtin/branch.c
t/t3200-branch.sh
Simple merge
Simple merge