Merge branch 'jk/commit-date-approxidate'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:46 +0000 (12:06 -0700)
* jk/commit-date-approxidate:
commit: accept more date formats for "--date"
commit: print "Date" line when the user has set date
pretty: make show_ident_date public
commit: use split_ident_line to compare author/committer

1  2 
builtin/commit.c
cache.h
Simple merge
diff --cc cache.h
Simple merge