]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4c2224e 31824d1)
Merge branch 'nd/worktree-kill-parse-ref' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:16 +0000 (14:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2017 05:14:16 +0000 (14:14 +0900)
commit5253ad109af7691d0b0fb3c9670aaaf775412c72
tree00292a2eec45efa23eb82c27471f0730dd78a85dtree | snapshot
parent4c2224e83951a685185bb8c1f83b28e22fee0e27commit | diff
parent31824d180d4f975e6b130cd9a33a9a0baef3d7cacommit | diff
Merge branch 'nd/worktree-kill-parse-ref' into maint

"git branch -M a b" while on a branch that is completely unrelated
to either branch a or branch b misbehaved when multiple worktree
was in use.  This has been fixed.

* nd/worktree-kill-parse-ref:
  branch: fix branch renaming not updating HEADs correctly
branch.c diff1 | diff2 | blob | history
t/t3200-branch.sh diff1 | diff2 | blob | history
worktree.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.