summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-11 06:17:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-11 06:17:46 (GMT)
commit55d1932bce99d83fa0d891331fe3f3562d33af2e (patch)
treecfd50a538a7214041f60dba488e3e48462e2a579 /Makefile
parent98e79f63be7e2cf043bd3150ae9ac0c8d118ce61 (diff)
parentf653aee5a37b909e772d612eb7e226f09fd2f3d3 (diff)
downloadgit-55d1932bce99d83fa0d891331fe3f3562d33af2e.zip
git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.gz
git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.bz2
Merge branch 'cr/tag'
* cr/tag: Teach "git stripspace" the --strip-comments option Make verify-tag a builtin. builtin-tag.c: Fix two memory leaks and minor notation changes. launch_editor(): Heed GIT_EDITOR and core.editor settings Make git tag a builtin.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b685c7e..4eb4637 100644
--- a/Makefile
+++ b/Makefile
@@ -208,7 +208,6 @@ SCRIPT_SH = \
git-pull.sh git-rebase.sh git-rebase--interactive.sh \
git-repack.sh git-request-pull.sh git-reset.sh \
git-sh-setup.sh \
- git-tag.sh git-verify-tag.sh \
git-am.sh \
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
git-merge-resolve.sh git-merge-ours.sh \
@@ -363,12 +362,14 @@ BUILTIN_OBJS = \
builtin-show-branch.o \
builtin-stripspace.o \
builtin-symbolic-ref.o \
+ builtin-tag.o \
builtin-tar-tree.o \
builtin-unpack-objects.o \
builtin-update-index.o \
builtin-update-ref.o \
builtin-upload-archive.o \
builtin-verify-pack.o \
+ builtin-verify-tag.o \
builtin-write-tree.o \
builtin-show-ref.o \
builtin-pack-refs.o