Merge branch 'sg/rerere-gc-old-still-used'
commite24058f57f4e76e38e20390c5927590f3cd48085
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:14:27 +0000 (31 16:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:14:27 +0000 (31 16:14 -0700)
treed8f9b7149447d6d1be6ea847b807d247d3356fd4
parentd8a94803842989582989fd5f5c3062c49134ad5b
parent7d7ff15b39abfa9e73b6475f189006a74dc26376
Merge branch 'sg/rerere-gc-old-still-used'

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