diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-11-24 11:07:55 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-24 22:44:18 +0900 |
| commit | b34eeea352f15f93e98982a0e7970b0026053fb2 (patch) | |
| tree | 62e3ae429b29cfd36ea9b8b759d19b95d3ca17bc /builtin/rebase--helper.c | |
| parent | commit: move print_commit_summary() to libgit (diff) | |
| download | tgif-b34eeea352f15f93e98982a0e7970b0026053fb2.tar.xz | |
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>
Diffstat (limited to 'builtin/rebase--helper.c')
0 files changed, 0 insertions, 0 deletions