]> git.99rst.org Git - git.git/commitdiff
Merge branch 'ah/rebase-keep-base-fix' into maint
authorJunio C Hamano <redacted>
Wed, 8 Jun 2022 21:27:52 +0000 (14:27 -0700)
committerJunio C Hamano <redacted>
Wed, 8 Jun 2022 21:27:52 +0000 (14:27 -0700)
"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.
source: <redacted>

* ah/rebase-keep-base-fix:
  rebase: use correct base for --keep-base when a branch is given


Trivial merge
git clone https://git.99rst.org/PROJECT