Merge branch 'rs/opt-updates'

"git cmd -h" updates.

* rs/opt-updates:
parseopt: group literal string alternatives in argument help
remote: improve argument help for add --mirror
checkout-index: improve argument help for --stage

diff --cc builtin/checkout-index.c
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc builtin/push.c
index ef4c188895beab317a66523b23a9f1c87e634405,b5a941ccc2214d52ad41409bf4b83799bc0f9e1c..d09a42062c36d930b8147d6b0a4bcfedf34a2321
--- 1/builtin/push.c
--- 2/builtin/push.c
+++ b/builtin/push.c
@@@ -558,10 -558,10 +558,10 @@@ int cmd_push(int argc, const char **arg
                OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
                OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
                { OPTION_CALLBACK,
 -                0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
 +                0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
                  N_("require old value of ref to be at this value"),
 -                PARSE_OPT_OPTARG, parseopt_push_cas_option },
 +                PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option },
-               { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "check|on-demand|no",
+               { OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
                        N_("control recursive pushing of submodules"),
                        PARSE_OPT_OPTARG, option_parse_recurse_submodules },
                OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/send-pack.c
Simple merge