Merge branch 'jc/parse-date-raw'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:12 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:08:12 +0000 (14:08 -0800)
* jc/parse-date-raw:
  parse_date(): '@' prefix forces git-timestamp
  parse_date(): allow ancient git-timestamp

1  2 
builtin/commit.c
date.c
git-sh-setup.sh
t/t3400-rebase.sh

Simple merge
diff --cc date.c
Simple merge
diff --cc git-sh-setup.sh
Simple merge
Simple merge