From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:43 +0000 (-0700)
Subject: Merge branch 'rs/opt-updates'
X-Git-Tag: v2.19.0-rc1~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc0df933c8fa09603a9e9798085ee07ca1a83f65;p=thirdparty%2Fgit.git

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
---

fc0df933c8fa09603a9e9798085ee07ca1a83f65
diff --cc builtin/push.c
index ef4c188895,b5a941ccc2..d09a42062c
--- a/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),