Code

Merge branch 'jc/pack-objects-bigfile' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:38 +0000 (14:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 21:57:38 +0000 (14:57 -0700)
* jc/pack-objects-bigfile:
  Teach core.bigfilethreashold to pack-objects

1  2 
Documentation/config.txt
cache.h
config.c
environment.c
fast-import.c

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