From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 07 Nov 2017 00:52:41 GMT
Subject: Re: [PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer
Message-ID: <alpine.DEB.2.21.1.1711070149490.6482@virtualbox>
In-Reply-To: <20171106112709.2121-7-phillip.wood@talktalk.net>

Hi Phillip,

On Mon, 6 Nov 2017, Phillip Wood wrote:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
> 
> Add the Signed-off-by: trailer in one place rather than adding it to
> the message when doing a recursive merge and specifying '--signoff'
> when running 'git commit'.

I would find this slightly easier to understand if it was written like
this (and separated into its own paragraph):

	Add the Signed-off-by: trailer by passing the `--signoff` option
	to `git commit` instead of adding the trailer manually (and only
	when the `recursive` merge strategy is in effect).

> This means that if there are conflicts when merging with a strategy
> other than 'recursive' the Signed-off-by: trailer will be added if the
> user commits the resolution themselves without passing '--signoff' to
> 'git commit'.

Nice!

> It also simplifies the in-process commit that is about to be added to
> the sequencer.

Also nice!

Thanks,
Dscho