summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-11-03 23:32:37 (GMT)
commit14f905caf2da593a65a2be51ff4d219e5cc3de04 (patch)
tree3b87dabb59e45bb55e9a9e45a7b2c96e07d67dca /builtin/am.c
parentccb47391c1e35c5475529cb8f3bd66028df5a943 (diff)
parentd96a0313efb7133f07dfe36e3cf9d8a04365b1e1 (diff)
downloadgit-14f905caf2da593a65a2be51ff4d219e5cc3de04.zip
git-14f905caf2da593a65a2be51ff4d219e5cc3de04.tar.gz
git-14f905caf2da593a65a2be51ff4d219e5cc3de04.tar.bz2
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
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 7b8e11e..98e29e0 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
};