Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 05:28:16 +0000 (21:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 05:28:16 +0000 (21:28 -0800)
* master:
  commit: suggest --amend --reset-author to fix commiter identity


Trivial merge