Merge branch 'rt/placeholder-in-usage' into maint
A couple of commands still showed "[options]" in their usage string to note where options should come on their command line, but we spell that "[<options>]" in most places these days. * rt/placeholder-in-usage: am, credential-cache: add angle brackets to usage string
This commit is contained in:
commit
14f905caf2
@ -2229,8 +2229,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
|
||||
int in_progress;
|
||||
|
||||
const char * const usage[] = {
|
||||
N_("git am [options] [(<mbox>|<Maildir>)...]"),
|
||||
N_("git am [options] (--continue | --skip | --abort)"),
|
||||
N_("git am [<options>] [(<mbox>|<Maildir>)...]"),
|
||||
N_("git am [<options>] (--continue | --skip | --abort)"),
|
||||
NULL
|
||||
};
|
||||
|
||||
|
@ -88,7 +88,7 @@ int main(int argc, const char **argv)
|
||||
int timeout = 900;
|
||||
const char *op;
|
||||
const char * const usage[] = {
|
||||
"git credential-cache [options] <action>",
|
||||
"git credential-cache [<options>] <action>",
|
||||
NULL
|
||||
};
|
||||
struct option options[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user