Merge branch 'km/bsd-shells'

diff --git a/builtin/commit.c b/builtin/commit.c
index 682f922c736dbaaa918a9f27c07487e3f15ec286..961e467242747dac07aa6f5e619e2d1a50570b06 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);
 }