Merge branch 'maint'
commitd2f15e29a6161b40dbc0142eb59f82092268e1d6
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 05:26:51 +0000 (12 21:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jan 2011 05:26:51 +0000 (12 21:26 -0800)
tree13129b7e3b9dc11eed15f7aa456b14010a0853d6
parent7fad99e14af6da89efe0d078e19ac8b7c02a3b5d
parent3f142468997f9d14d8051a96b2e9db265d41ac0d
Merge branch 'maint'

* maint:
  commit: suggest --amend --reset-author to fix commiter identity
builtin/commit.c