Merge branch 'jc/parse-date-raw' into next
commit486ae6e36ca5fa04386c8750ce5dbfb3ef40f913
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2012 21:05:16 +0000 (7 13:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Feb 2012 21:05:16 +0000 (7 13:05 -0800)
tree7eea694eb7c455f550296c6e24da3f9362bb47ea
parentc8c5f3f334615629b6414662538b7851f66760f6
parent2c733fb24c10a9d7aacc51f956bf9b7881980870
Merge branch 'jc/parse-date-raw' into next

* 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