Merge branch 'jc/cache-tree' into next

diff --git a/Makefile b/Makefile
index d2cc01a265d1ed5ccb7ac28a7afd025d4b76321e..4416af9bb05c710cf6577540f6f1edc94c93604b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -214,7 +214,7 @@ LIB_OBJS = \
        $(DIFF_OBJS)
 
 BUILTIN_OBJS = \
-       builtin-log.o builtin-help.o
+       builtin-log.o builtin-help.o builtin-count.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz