show --continue/skip etc. consistently in help

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

Signed-off-by: Phillip Wood <[email protected]>
---
cherry-pick and revert will be updated separately based on top of
https://public-inbox.org/git/[email protected]/T/#u

Author: phillipwood

builtin/am.c

@@ -2157,7 +2157,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

@@ -52,8 +52,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

@@ -31,7 +31,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
 };