diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:44 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:44 -0800 |
commit | 62bef66fe783a6a49e4418b6ce194cc94017bc7c (patch) | |
tree | c25b0184452cd4bc65ccab75ae748391c6a9f7b5 /sequencer.h | |
parent | Merge branch 'al/docs' (diff) | |
parent | pull: add the --gpg-sign option. (diff) | |
download | tgif-62bef66fe783a6a49e4418b6ce194cc94017bc7c.tar.xz |
Merge branch 'bc/gpg-sign-everywhere'
Teach "--gpg-sign" option to many commands that create commits.
* bc/gpg-sign-everywhere:
pull: add the --gpg-sign option.
rebase: add the --gpg-sign option
rebase: parse options in stuck-long mode
rebase: don't try to match -M option
rebase: remove useless arguments check
am: add the --gpg-sign option
am: parse options in stuck-long mode
git-sh-setup.sh: add variable to use the stuck-long mode
cherry-pick, revert: add the --gpg-sign option
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 1fc22dcabe..db43e9cf86 100644 --- a/sequencer.h +++ b/sequencer.h @@ -37,6 +37,8 @@ struct replay_opts { int mainline; + const char *gpg_sign; + /* Merge strategy */ const char *strategy; const char **xopts; |