diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 22:01:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 22:01:44 (GMT) |
| commit | 62bef66fe783a6a49e4418b6ce194cc94017bc7c (patch) | |
| tree | c25b0184452cd4bc65ccab75ae748391c6a9f7b5 /builtin | |
| parent | d8a1bac1d49dfe8879000e2bd07d138d3088f5b4 (diff) | |
| parent | ea230d8b626d48a5b7851d84f75dd6708479cb59 (diff) | |
| download | git-62bef66fe783a6a49e4418b6ce194cc94017bc7c.zip git-62bef66fe783a6a49e4418b6ce194cc94017bc7c.tar.gz git-62bef66fe783a6a49e4418b6ce194cc94017bc7c.tar.bz2 | |
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 'builtin')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 87659c9..065d88d 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -89,6 +89,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_STRING(0, "strategy", &opts->strategy, N_("strategy"), N_("merge strategy")), OPT_CALLBACK('X', "strategy-option", &opts, N_("option"), N_("option for merge strategy"), option_parse_x), + { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key id"), + N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_END(), OPT_END(), OPT_END(), |