summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-13 14:02:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-13 14:02:02 -0700
commit7783eb2e59684492e75068443e1f77f64fe37cc9 (patch)
tree28abef68309c3b2cfcb3398955eb3e2d63da5479 /Makefile
parentMerge branch 'ss/clone-guess-dir-name-simplify' (diff)
parentworktree: new place for "git prune --worktrees" (diff)
downloadtgif-7783eb2e59684492e75068443e1f77f64fe37cc9.tar.xz
Merge branch 'nd/multiple-work-trees'
"git checkout [<tree-ish>] <paths>" spent unnecessary cycles checking if the current branch was checked out elsewhere, when we know we are not switching the branches ourselves. * nd/multiple-work-trees: worktree: new place for "git prune --worktrees" checkout: don't check worktrees when not necessary
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 895f002869..8c3c724a7f 100644
--- 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)