Hi Phillip,
On Mon, 6 Nov 2017, Phillip Wood wrote:
> From: Phillip Wood <phillip.w...@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
