From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jun 2019 20:19:43 +0000 (-0700)
Subject: Merge branch 'pw/rebase-edit-message-for-replayed-merge'
X-Git-Tag: v2.23.0-rc0~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c51026115481834a1e0f49a2dafc1ce86025889c;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-edit-message-for-replayed-merge'

A "merge -c" instruction during "git rebase --rebase-merges" should
give the user a chance to edit the log message, even when there is
otherwise no need to create a new merge and replace the existing
one (i.e. fast-forward instead), but did not.  Which has been
corrected.

* pw/rebase-edit-message-for-replayed-merge:
  rebase -r: always reword merge -c
---

c51026115481834a1e0f49a2dafc1ce86025889c