diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-26 15:55:18 -0700 |
| commit | 0884726b43e356d5710db3d516c788fd0b95a57c (patch) | |
| tree | 566ca60f706c3163afb64ad57dfacf3ab6549bc8 /builtin | |
| parent | Merge branch 'jc/usage-stdin' (diff) | |
| parent | am, credential-cache: add angle brackets to usage string (diff) | |
| download | tgif-0884726b43e356d5710db3d516c788fd0b95a57c.tar.xz | |
Merge branch 'rt/placeholder-in-usage'
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/am.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index 6c8bbca226..fc6d3d21aa 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2246,8 +2246,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 }; |