diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-13 05:26:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-13 05:26:51 (GMT) |
| commit | d2f15e29a6161b40dbc0142eb59f82092268e1d6 (patch) | |
| tree | 13129b7e3b9dc11eed15f7aa456b14010a0853d6 | |
| parent | 7fad99e14af6da89efe0d078e19ac8b7c02a3b5d (diff) | |
| parent | 3f142468997f9d14d8051a96b2e9db265d41ac0d (diff) | |
| download | git-d2f15e29a6161b40dbc0142eb59f82092268e1d6.zip git-d2f15e29a6161b40dbc0142eb59f82092268e1d6.tar.gz git-d2f15e29a6161b40dbc0142eb59f82092268e1d6.tar.bz2 | |
Merge branch 'maint'
* maint:
commit: suggest --amend --reset-author to fix commiter identity
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 22ba54f..03cff5a 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" |