Merge branch 'maint'

* maint: commit: suggest --amend --reset-author to fix commiter identity
git-mirror · Jan 13, 2011 · d2f15e2 · d2f15e2
2 parents 7fad99e + 3f14246
commit d2f15e2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"