Merge branch 'sp/maint-fd-limit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:11:46 +0000 (22:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:11:46 +0000 (22:11 -0700)
* sp/maint-fd-limit:
  sha1_file.c: Don't retain open fds on small packs
  mingw: add minimum getrlimit() compatibility stub
  Limit file descriptors used by packs

1  2 
cache.h
fast-import.c

diff --cc cache.h
Simple merge
diff --cc fast-import.c
Simple merge