]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4a2e91d b5cabb4)
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)
commita0ab37de61c9ac7f57105d6b170947abaf1b642c
tree25d416ba467d741ee231dab53392393b795875f4tree | snapshot
parent4a2e91db652e197803c6f29e2c2f1c9dfbc16506commit | diff
parentb5cabb4a967fa455378ee7ddfa831a9bf0244753commit | diff
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
builtin/rebase.c diff1 | diff2 | blob | history
t/t3400-rebase.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.