Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Feb 2009 23:32:26 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Feb 2009 23:32:26 +0000 (15:32 -0800)
commit9b27ea95189b1f276c9f7e10df81fa1476a4ad4d
tree8116ae20f73dc9596be6be72628012b699680056
parent7e1100e9e939c9178b2aa3969349e9e8d34488bf
parent3d20c636af05c44a6ff4df9309c2bca108ee149b
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  Clear the delta base cache during fast-import checkpoint
cache.h
fast-import.c
sha1_file.c