Merge branch 'ah/rebase-keep-base-fix' into maint
commit363d54ff806097ee01ad0614dda950d0ca88987c
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:52 +0000 (8 14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:52 +0000 (8 14:27 -0700)
tree2b077c184f3c80b7afa44cad7cdea25f887c320a
parentd777ef9befe7cdf595981686954427d8cd6e4c4c
parent9e5ebe9668a0f152757182b80bae9b66aad11952
Merge branch 'ah/rebase-keep-base-fix' into maint

"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.
source: <20220421044233.894255-1-alexhenrie24@gmail.com>

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