author | Junio C Hamano <gitster@pobox.com> | |
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 22 Dec 2010 00:46:53 +0000 (16:46 -0800) | ||
commit | 7785c319da93a518e9bec91ab64a519c5d184a0c | |
tree | b18542e5728cfa6ac26edc7c8563a961571b4f93 | tree | snapshot |
parent | dbf80ff43003a2d255c4cc9e7d4be07efb8b07b1 | commit | diff |
parent | 4c28e4ada03f5440251545cf91e0d81bce9b010d | commit | diff |
Merge branch 'jk/commit-die-on-bogus-ident' into next
* 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
* 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 | diff1 | | diff2 | | blob | history |