Merge branch 'rt/placeholder-in-usage' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:37 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:37 +0000 (15:32 -0800)
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

builtin/am.c
credential-cache.c
index 7b8e11eeaa366c02aa0bf88017ed0af7b12162fb..98e29e044eabc8d8ff43bcc6fb09eb19dacd66d2 100644 (file)
@@ -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
        };
 
index 8689a1519a5635a1d92e9e4106936b4159d2e106..f4afdc6988c32cd95769dee488f8495b8a6ce5b6 100644 (file)
@@ -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[] = {