Merge branch 'jc/maint-reflog-bad-timestamp' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:43 +0000 (13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:43 +0000 (13:02 -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
diff --cc cache.h
Simple merge