| commit | 5253ad109af7691d0b0fb3c9670aaaf775412c72 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Oct 2017 05:14:16 +0000 (23 14:14 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Oct 2017 05:14:16 +0000 (23 14:14 +0900) | ||
| tree | 00292a2eec45efa23eb82c27471f0730dd78a85d | treesnapshot (tar.gz zip) |
| parent | 4c2224e83951a685185bb8c1f83b28e22fee0e27 | commitdiff |
| parent | 31824d180d4f975e6b130cd9a33a9a0baef3d7ca | commitdiff |
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
"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 | blobhistory |
| t/t3200-branch.sh | diff1 | diff2 | blobhistory |
| worktree.c | diff1 | diff2 | blobhistory |