cherry-pick: handle "-" after parsing options

diff --git a/builtin/revert.c b/builtin/revert.c
index c5e36b94c080212ec9241146c20ef2e323663bea..38aaa16fa9328cb4d776001382d19cec82a73d8d 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
 };
@@ -198,6 +198,8 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
                opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
                if (argc < 2)
                        usage_with_options(usage_str, options);
+               if (!strcmp(argv[1], "-"))
+                       argv[1] = "@{-1}";
                memset(&s_r_opt, 0, sizeof(s_r_opt));
                s_r_opt.assume_dashdash = 1;
                argc = setup_revisions(argc, argv, opts->revs, &s_r_opt);