summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-24 22:10:38 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-24 22:10:38 -0800
commit7070c03d514a5519a3a4c9dbb47932d522dcb4bd (patch)
treee5270015b4a100795164b1659a09ed763fa2b489
parent117c1b333da05e87a35ea73756518abe52407d84 (diff)
parent1044b1f6a1a56ae723fd19cddd769380dc775f48 (diff)
downloadgit-7070c03d514a5519a3a4c9dbb47932d522dcb4bd.tar.gz
Merge branch 'mg/commit-author-no-match-malformed-message' into maint
The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 5cd1478ebf..714638c5d6 100644
--- 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);
}