]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: simplify adding Signed-off-by: trailer
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Fri, 24 Nov 2017 11:07:55 +0000 (11:07 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Nov 2017 13:44:18 +0000 (22:44 +0900)
commitb34eeea352f15f93e98982a0e7970b0026053fb2
tree62e3ae429b29cfd36ea9b8b759d19b95d3ca17bc
parente47c6cafcb5a2223ea3de3d0b65f668f717cb2ab
sequencer: simplify adding Signed-off-by: trailer

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:
trailer will be added if the user commits the resolution themselves
without passing '--signoff' to 'git commit'. It also simplifies the
in-process commit that is about to be added to the sequencer.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c