From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Tue, 5 Jul 2005 13:32:29 +0000 (+0200)
Subject: Merge with Linus' current tree
X-Git-Tag: v0.99~71^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba;p=git.git

Merge with Linus' current tree
---

f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba
diff --cc Makefile
index a833a8561,9379e16bb..233d24afa
--- a/Makefile
+++ b/Makefile
@@@ -40,10 -34,9 +40,10 @@@ PROG=   git-update-cache git-diff-file
  	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-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
  
  all: $(PROG)