Merge branch 'jc/maint-reflog-bad-timestamp'
commit103209c6782586d92b04ee1fc71c0fd6f6385f5f
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:57:37 +0000 (27 14:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jan 2010 22:57:37 +0000 (27 14:57 -0800)
tree6add5ef9c0464315cbfceb3e11beaf95caf731e3
parent68186857a9bb0a71e9456155623e02d398a5b817
parent6c647af3060b8dd20da0e0b21dcd0eb95ec70841
Merge branch 'jc/maint-reflog-bad-timestamp'

* 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
date.c
sha1_name.c