Merge branch 'jc/maint-reflog-bad-timestamp'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:57:37 +0000 (14:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:57:37 +0000 (14:57 -0800)
* jc/maint-reflog-bad-timestamp:
  t0101: use a fixed timestamp when searching in the reflog
  Update @{bogus.timestamp} fix not to die()
  approxidate_careful() reports errorneous date string

1  2 
cache.h
date.c
sha1_name.c

diff --cc cache.h
Simple merge
diff --cc date.c
Simple merge
diff --cc sha1_name.c
Simple merge