summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:18 (GMT)
commit0884726b43e356d5710db3d516c788fd0b95a57c (patch)
tree566ca60f706c3163afb64ad57dfacf3ab6549bc8
parent97a9e546a27c98512fef39cd457a4da6dbb5063a (diff)
parentd96a0313efb7133f07dfe36e3cf9d8a04365b1e1 (diff)
downloadgit-0884726b43e356d5710db3d516c788fd0b95a57c.zip
git-0884726b43e356d5710db3d516c788fd0b95a57c.tar.gz
git-0884726b43e356d5710db3d516c788fd0b95a57c.tar.bz2
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
-rw-r--r--builtin/am.c4
-rw-r--r--credential-cache.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 6c8bbca..fc6d3d2 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
};
diff --git a/credential-cache.c b/credential-cache.c
index 8689a15..f4afdc6 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[] = {