summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2011-01-12 18:29:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-12 20:43:58 (GMT)
commit3f142468997f9d14d8051a96b2e9db265d41ac0d (patch)
treec925020fcedecabcde10a0a97dafd742ce8b79c7
parent54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156 (diff)
downloadgit-3f142468997f9d14d8051a96b2e9db265d41ac0d.zip
git-3f142468997f9d14d8051a96b2e9db265d41ac0d.tar.gz
git-3f142468997f9d14d8051a96b2e9db265d41ac0d.tar.bz2
commit: suggest --amend --reset-author to fix commiter identity
Since the message advises to fix the configuration first, the advantage of using this command is that it is cut-and-paste ready, while using --author='...' requires the user to type his name and email again. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 3bcb4b7..6e2f12a 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -45,9 +45,9 @@ static const char implicit_ident_advice[] =
" git config --global user.name \"Your Name\"\n"
" git config --global user.email you@example.com\n"
"\n"
-"If the identity used for this commit is wrong, you can fix it with:\n"
+"After doing this, you may fix the identity used for this commit with:\n"
"\n"
-" git commit --amend --author='Your Name <you@example.com>'\n";
+" git commit --amend --reset-author\n";
static const char empty_amend_advice[] =
"You asked to amend the most recent commit, but doing so would make\n"