Merge branch 'mh/show-branch-topic'

diff --git a/builtin/revert.c b/builtin/revert.c
index 87659c9fdb749bf8cbf33ce71391fdfe284edd6d..56a2c366698f838146bcf62d7b2c7a8a115287e1 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -19,13 +19,13 @@
  */
 
 static const char * const revert_usage[] = {
-       N_("git revert [options] <commit-ish>..."),
+       N_("git revert [<options>] <commit-ish>..."),
        N_("git revert <subcommand>"),
        NULL
 };
 
 static const char * const cherry_pick_usage[] = {
-       N_("git cherry-pick [options] <commit-ish>..."),
+       N_("git cherry-pick [<options>] <commit-ish>..."),
        N_("git cherry-pick <subcommand>"),
        NULL
 };
@@ -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(),