summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-01-10 06:36:36 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-10 08:27:01 -0800
commit9a0eaf83eab5f53db0ba6a514c4d4cf16e846f30 (patch)
treea0fdf34b38d51b090dc1180d50d3d7f3f16b1c62 /Makefile
parentDon't save the commit buffer in git-describe. (diff)
downloadtgif-9a0eaf83eab5f53db0ba6a514c4d4cf16e846f30.tar.xz
Make git-describe a builtin.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 43113e9e16..e4f520ac9d 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,7 @@ PROGRAMS = \
git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-pack-redundant$X git-var$X \
- git-describe$X git-merge-tree$X git-imap-send$X \
+ git-merge-tree$X git-imap-send$X \
git-merge-recursive$X \
$(EXTRA_PROGRAMS)
@@ -275,6 +275,7 @@ BUILTIN_OBJS = \
builtin-check-ref-format.o \
builtin-commit-tree.o \
builtin-count-objects.o \
+ builtin-describe.o \
builtin-diff.o \
builtin-diff-files.o \
builtin-diff-index.o \