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

diff --combined builtin/am.c
index 7b8e11eeaa366c02aa0bf88017ed0af7b12162fb,98992cd013bd5a2eecdfc2425139e648e22cd89e..98e29e044eabc8d8ff43bcc6fb09eb19dacd66d2
--- 1/builtin/am.c
--- 2/builtin/am.c
+++ b/builtin/am.c
@@@ -1343,7 -1343,7 +1343,7 @@@ static int parse_mail(struct am_state *
        strbuf_addstr(&msg, "\n\n");
        if (strbuf_read_file(&msg, am_path(state, "msg"), 0) < 0)
                die_errno(_("could not read '%s'"), am_path(state, "msg"));
 -      stripspace(&msg, 0);
 +      strbuf_stripspace(&msg, 0);
  
        if (state->signoff)
                am_signoff(&msg);
@@@ -2208,17 -2208,6 +2208,17 @@@ enum resume_mode 
        RESUME_ABORT
  };
  
 +static int git_am_config(const char *k, const char *v, void *cb)
 +{
 +      int status;
 +
 +      status = git_gpg_config(k, v, NULL);
 +      if (status)
 +              return status;
 +
 +      return git_default_config(k, v, NULL);
 +}
 +
  int cmd_am(int argc, const char **argv, const char *prefix)
  {
        struct am_state state;
@@@ -2229,8 -2218,8 +2229,8 @@@
        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
        };
  
@@@ -2319,7 -2308,7 +2319,7 @@@
                OPT_END()
        };
  
 -      git_config(git_default_config, NULL);
 +      git_config(git_am_config, NULL);
  
        am_state_init(&state, git_path("rebase-apply"));