Merge branch 'jc/parse-date-raw' into maint
commit87cb3b82a42613dc3ffd1eddf95f8c306a045ad1
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:15 +0000 (13 11:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 19:42:15 +0000 (13 11:42 -0800)
tree056bc067a0f6de58609373179d1795df07821627
parent5a62b531ae1fda10d023082cb73a5440dbd54df1
parent2c733fb24c10a9d7aacc51f956bf9b7881980870
Merge branch 'jc/parse-date-raw' into maint

* 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