show --continue/skip etc. consistently in help

Show a similar synopsis for --continue/--skip etc. in the help printed
with -h as in the man pages.

Signed-off-by: Phillip Wood <[email protected]>

Author: phillipwood

builtin/am.c

@@ -2164,7 +2164,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 
 	const char * const usage[] = {
 		N_("git am [<options>] [(<mbox> | <Maildir>)...]"),
-		N_("git am [<options>] (--continue | --skip | --abort)"),
+		N_("git am [<options>] (--continue | --skip | --abort | --quit"
+			" | --show-current-patch)"),
 		NULL
 	};
 

builtin/merge.c

@@ -53,8 +53,7 @@ struct strategy {
 
 static const char * const builtin_merge_usage[] = {
 	N_("git merge [<options>] [<commit>...]"),
-	N_("git merge --abort"),
-	N_("git merge --continue"),
+	N_("git merge (--continue | --skip | --abort | --quit)"),
 	NULL
 };
 

builtin/rebase.c

@@ -33,7 +33,8 @@ static char const * const builtin_rebase_usage[] = {
 		"[<upstream>] [<branch>]"),
 	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
 		"--root [<branch>]"),
-	N_("git rebase --continue | --abort | --skip | --edit-todo"),
+	N_("git rebase (--continue | --skip | --abort | --quit | --edit-todo | "
+	   "--show-current-patch)"),
 	NULL
 };
 

builtin/revert.c

@@ -22,13 +22,13 @@
 
 static const char * const revert_usage[] = {
 	N_("git revert [<options>] <commit-ish>..."),
-	N_("git revert <subcommand>"),
+	N_("git revert (--continue | --skip | --abort | --quit)"),
 	NULL
 };
 
 static const char * const cherry_pick_usage[] = {
 	N_("git cherry-pick [<options>] <commit-ish>..."),
-	N_("git cherry-pick <subcommand>"),
+	N_("git cherry-pick (--continue | --skip | --abort | --quit)"),
 	NULL
 };