summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-05 08:42:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-05 08:42:11 (GMT)
commit712d865523cbfd3025e555398b8caa164466529d (patch)
tree7a900dc8fd8f01a18c4b69db3129b9f094006d68 /Makefile
parentf5f2c52bb08a7fc5bde6a7eb6552235df9daca71 (diff)
parent0516de30e8bdd26086e2a3edd3375981fd0c34d6 (diff)
downloadgit-712d865523cbfd3025e555398b8caa164466529d.zip
git-712d865523cbfd3025e555398b8caa164466529d.tar.gz
git-712d865523cbfd3025e555398b8caa164466529d.tar.bz2
Merge branch 'master' of .
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f13ff5a..033c96e 100644
--- a/Makefile
+++ b/Makefile
@@ -65,12 +65,13 @@ SCRIPTS=git git-merge-one-file-script git-prune-script \
gitk git-cherry git-rebase-script git-relink-script git-repack-script \
git-format-patch-script git-sh-setup-script git-push-script \
git-branch-script git-parse-remote-script git-verify-tag-script \
- git-ls-remote-script git-clone-dumb-http git-rename-script \
+ git-ls-remote-script git-rename-script \
git-request-pull-script git-bisect-script
SCRIPTS += git-count-objects-script
SCRIPTS += git-revert-script
SCRIPTS += git-octopus-script
+SCRIPTS += git-archimport-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \