From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Jun 2022 21:27:52 +0000 (-0700)
Subject: Merge branch 'ah/rebase-keep-base-fix' into maint
X-Git-Tag: v2.37.0-rc0~19^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=363d54ff806097ee01ad0614dda950d0ca88987c;p=thirdparty%2Fgit.git

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
---

363d54ff806097ee01ad0614dda950d0ca88987c