diff options
| author | Nicolas Vigier <boklm@mars-attacks.org> | 2014-01-24 00:50:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 23:15:52 (GMT) |
| commit | 3253553e12d40da3bca818528f49a63c95f43aa3 (patch) | |
| tree | 2238600ec94e6eca80f1443aa237e6c3f585d293 /builtin | |
| parent | bd3e186d811a13d8687584856f345a767e3e4d67 (diff) | |
| download | git-3253553e12d40da3bca818528f49a63c95f43aa3.zip git-3253553e12d40da3bca818528f49a63c95f43aa3.tar.gz git-3253553e12d40da3bca818528f49a63c95f43aa3.tar.bz2 | |
cherry-pick, revert: add the --gpg-sign option
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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(), |