Merge branch 'ms/submodule-update-config-doc' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 5cd1478ebfdae36a8112c7f93f9017b54954cf44..714638c5d625f370ce87f26b55375f874290ed95 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1050,7 +1050,7 @@ static const char *find_author_by_nickname(const char *name)
                clear_mailmap(&mailmap);
                return strbuf_detach(&buf, NULL);
        }
-       die(_("No existing author found with '%s'"), name);
+       die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
 }