Re: [PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer

2017-11-07 Thread Phillip Wood
On 07/11/17 04:52, Junio C Hamano wrote: > Phillip Wood writes: > >> diff --git a/sequencer.c b/sequencer.c >> index >> ae24405c23d021ed7916e5e2d9df6de27f867a2e..3e4c3bbb265db58df22cfcb5a321fb74d822327e >> 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -477,9 +477,6 @@ static int do_rec

Re: [PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer

2017-11-06 Thread Junio C Hamano
Phillip Wood writes: > diff --git a/sequencer.c b/sequencer.c > index > ae24405c23d021ed7916e5e2d9df6de27f867a2e..3e4c3bbb265db58df22cfcb5a321fb74d822327e > 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -477,9 +477,6 @@ static int do_recursive_merge(struct commit *base, struct > commit *

Re: [PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer

2017-11-06 Thread Johannes Schindelin
Hi Phillip, On Mon, 6 Nov 2017, Phillip Wood wrote: > From: Phillip Wood > > 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 i

[PATCH v1 6/8] sequencer: simplify adding Signed-off-by: trailer

2017-11-06 Thread Phillip Wood
From: Phillip Wood 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'. This means that if there are conflicts when merging with a strategy other than 'recursive' the Signed-off-by: trai