diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-05 10:43:03 -0800 |
| commit | a0ab37de61c9ac7f57105d6b170947abaf1b642c (patch) | |
| tree | 25d416ba467d741ee231dab53392393b795875f4 /unpack-trees.c | |
| parent | Merge branch 'hv/receive-denycurrent-everywhere' (diff) | |
| parent | rebase: refuse to switch to branch already checked out elsewhere (diff) | |
| download | tgif-a0ab37de61c9ac7f57105d6b170947abaf1b642c.tar.xz | |
Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
"git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
checked it out, even when the BRANCH is checked out in a different
worktree. This has been corrected.
* es/do-not-let-rebase-switch-to-protected-branch:
rebase: refuse to switch to branch already checked out elsewhere
t3400: make test clean up after itself
Diffstat (limited to 'unpack-trees.c')
0 files changed, 0 insertions, 0 deletions