Merge branch 'jc/worktree-config' into maint

diff --git a/builtin/am.c b/builtin/am.c
index 739b34dcf25a1355246bed436ec7fdb4723d7ca7..9e2ae5cba40ece7fa8c489a18ba610ab2f4f6e2f 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2222,7 +2222,7 @@ 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>] [(<mbox> | <Maildir>)...]"),
                N_("git am [<options>] (--continue | --skip | --abort)"),
                NULL
        };