]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/do-not-let-rebase-switch-to-protected-branch'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:03 +0000 (10:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2020 18:43:03 +0000 (10:43 -0800)
"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

1  2 
builtin/rebase.c
t/t3400-rebase.sh

Simple merge
Simple merge