summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthias Urlichs <smurf@smurf.noris.de>2005-07-05 13:32:29 (GMT)
committerMatthias Urlichs <smurf@smurf.noris.de>2005-07-05 13:32:29 (GMT)
commitf4b3a4c30b5ea3a5de2a2597a3c53266017d02ba (patch)
tree53a29e3d3820edd03f39ab5206b27055fc657c33 /Makefile
parent7a662e896bcd391265477e304d7af6e5d2ca1deb (diff)
parentf13bbe7f56e49a11f6bfc3b73a463c741f969c9c (diff)
downloadgit-f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba.zip
git-f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba.tar.gz
git-f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba.tar.bz2
Merge with Linus' current tree
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a833a85..233d24a 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-unpack-file git-export git-diff-cache git-convert-cache \
git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
git-diff-helper git-tar-tree git-local-pull git-write-blob \
- git-get-tar-commit-id git-apply git-stripspace git-cvs2git \
+ git-get-tar-commit-id git-apply git-stripspace \
git-diff-stages git-rev-parse git-patch-id git-pack-objects \
git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
git-prune-packed git-fetch-pack git-upload-pack
@@ -129,7 +129,6 @@ git-diff-helper: diff-helper.c
git-tar-tree: tar-tree.c
git-write-blob: write-blob.c
git-stripspace: stripspace.c
-git-cvs2git: cvs2git.c
git-diff-stages: diff-stages.c
git-rev-parse: rev-parse.c
git-patch-id: patch-id.c