diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:23 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:23 +0300 |
commit | f757794d9dbd1152c0a557d3a07617ac2fa5bc09 (patch) | |
tree | 7f43f34e4a1c2d7ed83f473fa0e5dce87f7bdadb /sequencer.h | |
parent | 3d67555744e6d4fbbc52b0a67c4b630c5d319bc2 (diff) | |
parent | d74f3e58114d1a8544592fcd5dcdfe0fc4993d27 (diff) |
Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'
"git cherry-pick" run with the "-x" or the "--signoff" option used
to (and more importantly, ought to) clean up the commit log message
with the --cleanup=space option by default, but this has been
broken since late 2017. This has been fixed.
* pw/sequencer-cleanup-with-signoff-x-fix:
sequencer: fix cleanup with --signoff and -x
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index a515ee4457..b69e7686c9 100644 --- a/sequencer.h +++ b/sequencer.h @@ -48,6 +48,7 @@ struct replay_opts { char *gpg_sign; enum commit_msg_cleanup_mode default_msg_cleanup; + int explicit_cleanup; /* Merge strategy */ char *strategy; |