From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 May 2022 20:56:21 +0000 (-0700)
Subject: Merge branch 'ah/rebase-keep-base-fix'
X-Git-Tag: v2.37.0-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=202161fa8ddce803bd63b9687ac15ff2b016c14d;p=thirdparty%2Fgit.git

Merge branch 'ah/rebase-keep-base-fix'

"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
commit to rebase onto incorrectly, which has been corrected.

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

202161fa8ddce803bd63b9687ac15ff2b016c14d