Merge branch 'master' into js/shallow
[gitweb.git] / Makefile
index 475047f100ef1a2a9cf73557eba3b300e74cac9d..c21b91bfab2e8665be728593c64352137c857fd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -250,8 +250,7 @@ LIB_OBJS = \
        revision.o pager.o tree-walk.o xdiff-interface.o \
        write_or_die.o trace.o list-objects.o grep.o \
        alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
-       color.o wt-status.o archive-zip.o archive-tar.o \
-       utf8.o
+       color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o
 
 BUILTIN_OBJS = \
        builtin-add.o \
@@ -287,6 +286,7 @@ BUILTIN_OBJS = \
        builtin-prune-packed.o \
        builtin-push.o \
        builtin-read-tree.o \
+       builtin-reflog.o \
        builtin-repo-config.o \
        builtin-rerere.o \
        builtin-rev-list.o \