Merge branch 'nd/multiple-work-trees'

diff --git a/Makefile b/Makefile
index 895f002869045288dfc6298e596c020aa4bc8efd..8c3c724a7f5e0594ad836065757371f7a144c472 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -910,6 +910,7 @@ BUILTIN_OBJS += builtin/var.o
 BUILTIN_OBJS += builtin/verify-commit.o
 BUILTIN_OBJS += builtin/verify-pack.o
 BUILTIN_OBJS += builtin/verify-tag.o
+BUILTIN_OBJS += builtin/worktree.o
 BUILTIN_OBJS += builtin/write-tree.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)