aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-07 16:33:59 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-07 16:33:59 -0800
commit24ad8e0ce23d08d28a5d664ab6164b10125146ce (patch)
treeedcba1269b22d79a04558b83f47617f3ecc2acd0 /Makefile
parent231f240b63bd6cb1313e8952448b3d5b9d2fdf26 (diff)
parent7bd9641df5b7cca91b21bfdc587962c59700786c (diff)
downloadgit-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.gz
git-24ad8e0ce23d08d28a5d664ab6164b10125146ce.tar.xz
Merge branch 'jc/pickaxe'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6d324fb56..a042df4a2 100644
--- a/Makefile
+++ b/Makefile
@@ -290,6 +290,7 @@ BUILTIN_OBJS = \
builtin-mv.o \
builtin-name-rev.o \
builtin-pack-objects.o \
+ builtin-pickaxe.o \
builtin-prune.o \
builtin-prune-packed.o \
builtin-push.o \