Merge branch 'jc/maint-reflog-bad-timestamp' into maint
commit410e99fadf25b65b70d9bf90fd8bd5a5d1ea3c8a
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:43 +0000 (10 13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:02:43 +0000 (10 13:02 -0800)
tree4cc0ed1e586136d931397d3b116be20d6d487688
parentc329898abb167f05e37f3d0305e833127a26a4d0
parent6c647af3060b8dd20da0e0b21dcd0eb95ec70841
Merge branch 'jc/maint-reflog-bad-timestamp' into maint

* 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
cache.h