Merge branch 'jc/parse-date-raw'
commit3d8bc74127bbb583bc437214a1d6c9afcf77646c
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:12 +0000 (10 14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:12 +0000 (10 14:08 -0800)
tree6d1788c66ea9e038252cf6641b5c580c641dcb88
parentfd6abd0c65b38897da64ef883ed1934d2b2b1a3a
parent2c733fb24c10a9d7aacc51f956bf9b7881980870
Merge branch 'jc/parse-date-raw'

* jc/parse-date-raw:
  parse_date(): '@' prefix forces git-timestamp
  parse_date(): allow ancient git-timestamp
builtin/commit.c
date.c
git-sh-setup.sh
t/t3400-rebase.sh