Re: [PATCH] rebase -r: always reword merge -c

2019-04-30 Thread Johannes Schindelin
Hi Phillip, On Tue, 30 Apr 2019, Phillip Wood wrote: > On 29/04/2019 17:14, Johannes Schindelin wrote: > > Hi Phillip, > > > > On Fri, 26 Apr 2019, Phillip Wood wrote: > > > > > ret = !!run_git_commit(r, git_path_merge_msg(r), opts, > > > run_commit_flags); > > > > > > diff --git

Re: [PATCH] rebase -r: always reword merge -c

2019-04-30 Thread Phillip Wood
Hi Dscho On 29/04/2019 17:14, Johannes Schindelin wrote: Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: From: Phillip Wood 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 i

Re: [PATCH] rebase -r: always reword merge -c

2019-04-29 Thread Johannes Schindelin
Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: > From: Phillip Wood > > 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.

[PATCH] rebase -r: always reword merge -c

2019-04-26 Thread Phillip Wood
From: Phillip Wood 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 --- sequencer.c |