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

diff --git a/builtin/am.c b/builtin/am.c
index 6c8bbca22630cfd112597fe13e6307daa8f25d1b..fc6d3d21aac54f9d820e3cae60e08d81366787be 100644 (file)
--- 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 8689a1519a5635a1d92e9e4106936b4159d2e106..f4afdc6988c32cd95769dee488f8495b8a6ce5b6 100644 (file)
--- 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[] = {