diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:37 +0300 |
| commit | 14f905caf2da593a65a2be51ff4d219e5cc3de04 (patch) | |
| tree | 3b87dabb59e45bb55e9a9e45a7b2c96e07d67dca | |
| parent | ccb47391c1e35c5475529cb8f3bd66028df5a943 (diff) | |
| parent | d96a0313efb7133f07dfe36e3cf9d8a04365b1e1 (diff) | |
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
| -rw-r--r-- | builtin/am.c | 4 | ||||
| -rw-r--r-- | credential-cache.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c index 7b8e11eeaa..98e29e044e 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -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 }; diff --git a/credential-cache.c b/credential-cache.c index 8689a1519a..f4afdc6988 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -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[] = { |