Code

Merge branch 'jk/commit-die-on-bogus-ident'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:41:14 +0000 (14:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:41:14 +0000 (14:41 -0800)
commit3ea3860758cc2501388059a89c1e5f4a90acb50d
treeb18542e5728cfa6ac26edc7c8563a961571b4f93
parent02fedc0f4835de7414b78e21739464a29520c94a
parent4c28e4ada03f5440251545cf91e0d81bce9b010d
Merge branch 'jk/commit-die-on-bogus-ident'

* jk/commit-die-on-bogus-ident:
  commit: die before asking to edit the log message
  ident: die on bogus date format

Conflicts:
builtin/commit.c
builtin/commit.c