From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2022 19:54:27 +0000 (-0700)
Subject: Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
X-Git-Tag: v2.39.0-rc0~60^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a524c627a424171c9cc2be2258725adc3f0bcc5a;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes

* pw/rebase-keep-base-fixes:
  rebase --keep-base: imply --no-fork-point
  rebase --keep-base: imply --reapply-cherry-picks
  rebase: factor out branch_base calculation
  rebase: rename merge_base to branch_base
  rebase: store orig_head as a commit
  rebase: be stricter when reading state files containing oids
  t3416: set $EDITOR in subshell
  t3416: tighten two tests
---

a524c627a424171c9cc2be2258725adc3f0bcc5a