Merge branch 'sg/rerere-gc-old-still-used' into maint
commitc7f649a794250ca680569bd8c2466af42acb434a
authorJunio C Hamano <gitster@pobox.com>
Wed, 1 Sep 2010 20:57:23 +0000 (1 13:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 1 Sep 2010 20:57:23 +0000 (1 13:57 -0700)
tree25e2df69993bb180b1785cb2577cc2cc2ca62ca7
parente4f8fce5c18c9544d3f1a07929fc14e7cbddbcc3
parent7d7ff15b39abfa9e73b6475f189006a74dc26376
Merge branch 'sg/rerere-gc-old-still-used' into maint

* sg/rerere-gc-old-still-used:
  rerere: fix overeager gc
  mingw_utime(): handle NULL times parameter
builtin/rerere.c
compat/mingw.c
rerere.c