projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e45c9b0 568508e)
Merge branch 'jc/stream-to-pack'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:40 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:40 +0000 (22:33 -0800)
commit48b303675aa238c209e527feadcbb7ba1c025c97
tree6a48f4388867f836db0e4c015098348079a9185dtree | snapshot
parente45c9b03c32620c444f464403c23534160998624commit | diff
parent568508e76570e9ea36aad6446959424cebcf0535commit | diff
Merge branch 'jc/stream-to-pack'

* jc/stream-to-pack:
  bulk-checkin: replace fast-import based implementation
  csum-file: introduce sha1file_checkpoint
  finish_tmp_packfile(): a helper function
  create_tmp_packfile(): a helper function
  write_pack_header(): a helper function

Conflicts:
pack.h
Makefile diff1 | diff2 | blob | history
builtin/pack-objects.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
config.c diff1 | diff2 | blob | history
environment.c diff1 | diff2 | blob | history
fast-import.c diff1 | diff2 | blob | history
pack-write.c diff1 | diff2 | blob | history
pack.h diff1 | diff2 | blob | history
sha1_file.c diff1 | diff2 | blob | history
Git—the stupid content tracker