Merge branch 'rt/placeholder-in-usage' into maint

diff --git a/builtin/am.c b/builtin/am.c
index 7b8e11eeaa366c02aa0bf88017ed0af7b12162fb..98e29e044eabc8d8ff43bcc6fb09eb19dacd66d2 100644 (file)
--- 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
        };