summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-26 22:55:16 (GMT)
commita46dcfb8403191ce042ad123a3314a174fa9ca4c (patch)
treefa2b1265bbc89430e02e5b4ebc59f85ab6b55eb7 /Makefile
parent9c53de7de12abfb9c13f5e7a82024680e3a90944 (diff)
parentbb9c03b82add467592249a222018a150684a4c97 (diff)
downloadgit-a46dcfb8403191ce042ad123a3314a174fa9ca4c.zip
git-a46dcfb8403191ce042ad123a3314a174fa9ca4c.tar.gz
git-a46dcfb8403191ce042ad123a3314a174fa9ca4c.tar.bz2
Merge branch 'mr/worktree-list'
Add the "list" subcommand to "git worktree". * mr/worktree-list: worktree: add 'list' command worktree: add details to the worktree struct worktree: add a function to get worktree details worktree: refactor find_linked_symref function worktree: add top-level worktree.c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0d9f5dd..8466333 100644
--- a/Makefile
+++ b/Makefile
@@ -808,6 +808,7 @@ LIB_OBJS += version.o
LIB_OBJS += versioncmp.o
LIB_OBJS += walker.o
LIB_OBJS += wildmatch.o
+LIB_OBJS += worktree.o
LIB_OBJS += wrapper.o
LIB_OBJS += write_or_die.o
LIB_OBJS += ws.o