Code

Merge branch 'jc/bigfile'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2011 23:23:26 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2011 23:23:26 +0000 (16:23 -0700)
* jc/bigfile:
  Bigfile: teach "git add" to send a large file straight to a pack
  index_fd(): split into two helper functions
  index_fd(): turn write_object and format_check arguments into one flag

1  2 
cache.h
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge