Merge branch 'jk/commit-die-on-bogus-ident' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:45:12 +0000 (13:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:45:12 +0000 (13:45 -0800)
* jk/commit-die-on-bogus-ident:
commit: die before asking to edit the log message
ident: die on bogus date format

Trivial merge