development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-26 19:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rt/placeholder-in-usage' into maint

Browse source 
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:
Junio C Hamano 2015-11-03 15:32:37 -08:00
parent ccb47391c1 d96a0313ef
commit 14f905caf2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/am.c
View file

@ -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
};

2
credential-cache.c
View file

@ -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[] = {