From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2021 20:49:28 +0000 (-0700)
Subject: Merge branch 'pw/rebase-r-fixes'
X-Git-Tag: v2.34.0-rc0~220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9135259b0387ce55cc9bd9671653fc33bb734b1e;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-r-fixes'

Various bugs in "git rebase -r" have been fixed.

* pw/rebase-r-fixes:
  rebase -r: fix merge -c with a merge strategy
  rebase -r: don't write .git/MERGE_MSG when fast-forwarding
  rebase -i: add another reword test
  rebase -r: make 'merge -c' behave like reword
---

9135259b0387ce55cc9bd9671653fc33bb734b1e