Merge branch 'jc/grep' into next

diff --git a/Makefile b/Makefile
index f184a8d4bb34a8a1a588732326f755dda2d81df3..2aa3586d02619a844f44486f5aebfc8b518551cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ LIB_OBJS = \
 
 BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o \
-       builtin-push.o
+       builtin-push.o builtin-grep.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 LIBS = $(GITLIBS) -lz