diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-10 23:17:46 -0700 |
| commit | 55d1932bce99d83fa0d891331fe3f3562d33af2e (patch) | |
| tree | cfd50a538a7214041f60dba488e3e48462e2a579 /Makefile | |
| parent | 98e79f63be7e2cf043bd3150ae9ac0c8d118ce61 (diff) | |
| parent | f653aee5a37b909e772d612eb7e226f09fd2f3d3 (diff) | |
| download | git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.gz git-55d1932bce99d83fa0d891331fe3f3562d33af2e.tar.xz | |
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-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |