summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-16 22:33:40 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-16 22:33:40 -0800
commit48b303675aa238c209e527feadcbb7ba1c025c97 (patch)
tree6a48f4388867f836db0e4c015098348079a9185d /Makefile
parente45c9b03c32620c444f464403c23534160998624 (diff)
parent568508e76570e9ea36aad6446959424cebcf0535 (diff)
downloadgit-48b303675aa238c209e527feadcbb7ba1c025c97.tar.gz
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ed8232075e..0464e1fc68 100644
--- a/Makefile
+++ b/Makefile
@@ -511,6 +511,7 @@ LIB_H += argv-array.h
LIB_H += attr.h
LIB_H += blob.h
LIB_H += builtin.h
+LIB_H += bulk-checkin.h
LIB_H += cache.h
LIB_H += cache-tree.h
LIB_H += color.h
@@ -600,6 +601,7 @@ LIB_OBJS += base85.o
LIB_OBJS += bisect.o
LIB_OBJS += blob.o
LIB_OBJS += branch.o
+LIB_OBJS += bulk-checkin.o
LIB_OBJS += bundle.o
LIB_OBJS += cache-tree.o
LIB_OBJS += color.o