From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] rebase -r: always reword merge -c
Date: Fri, 3 May 2019 11:23:30 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905031123150.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190502102249.9071-1-phillip.wood123@gmail.com>
Hi Phillip,
On Thu, 2 May 2019, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> If a merge can be fast-forwarded then make sure that we still edit the
> commit message if the user specifies -c. The implementation follows the
> same pattern that is used for ordinary rewords that are fast-forwarded.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
ACK!
Thank you,
Dscho
next prev parent reply other threads:[~2019-05-03 9:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 10:33 [PATCH] rebase -r: always reword merge -c Phillip Wood
2019-04-29 16:14 ` Johannes Schindelin
2019-04-30 9:01 ` Phillip Wood
2019-04-30 22:51 ` Johannes Schindelin
2019-05-02 10:22 ` [PATCH v2] " Phillip Wood
2019-05-03 9:23 ` Johannes Schindelin [this message]
2019-05-17 6:56 ` Johannes Schindelin
2019-05-19 1:32 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1905031123150.45@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).