From: H. Peter Anvin <hpa@smyrno.hos.anvin.org>
Date: Fri, 30 Sep 2005 17:44:21 +0000 (-0700)
Subject: Merge with master.kernel.org:/pub/scm/git/git.git
X-Git-Tag: v0.99.9~211
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=300b4801b75a59961e66ad9fa96941e46fd76be5;p=git.git

Merge with master.kernel.org:/pub/scm/git/git.git
---

300b4801b75a59961e66ad9fa96941e46fd76be5
diff --cc Makefile
index 1f4f31b5,e943954c..8b152dd5
--- a/Makefile
+++ b/Makefile
@@@ -103,24 -101,26 +103,24 @@@ SIMPLE_PROGRAMS = 
  
  # ... and all the rest
  PROGRAMS = \
 -	git-apply git-cat-file \
 -	git-checkout-index git-clone-pack git-commit-tree \
 -	git-convert-objects git-diff-files \
 -	git-diff-index git-diff-stages \
 -	git-diff-tree git-fetch-pack git-fsck-objects \
 -	git-hash-object git-init-db \
 -	git-local-fetch git-ls-files git-ls-tree git-merge-base \
 -	git-merge-index git-mktag git-pack-objects git-patch-id \
 -	git-peek-remote git-prune-packed git-read-tree \
 -	git-receive-pack git-rev-list git-rev-parse \
 -	git-send-pack git-show-branch \
 -	git-show-index git-ssh-fetch \
 -	git-ssh-upload git-tar-tree git-unpack-file \
 -	git-unpack-objects git-update-index git-update-server-info \
 -	git-upload-pack git-verify-pack git-write-tree \
 -	git-update-ref \
 -	$(SIMPLE_PROGRAMS)
 +	git-apply$(X) git-cat-file$(X) git-checkout-index$(X)		\
 +	git-clone-pack$(X) git-commit-tree$(X) git-convert-objects$(X)	\
 +	git-diff-files$(X) git-diff-index$(X) git-diff-stages$(X)	\
 +	git-diff-tree$(X) git-fetch-pack$(X) git-fsck-objects$(X)	\
 +	git-hash-object$(X) git-init-db$(X) git-local-fetch$(X)		\
 +	git-ls-files$(X) git-ls-tree$(X) git-merge-base$(X)		\
 +	git-merge-index$(X) git-mktag$(X) git-pack-objects$(X)		\
 +	git-patch-id$(X) git-peek-remote$(X) git-prune-packed$(X)	\
 +	git-read-tree$(X) git-receive-pack$(X) git-rev-list$(X)		\
 +	git-rev-parse$(X) git-send-pack$(X) git-show-branch$(X)		\
 +	git-show-index$(X) git-ssh-fetch$(X) git-ssh-upload$(X)		\
 +	git-tar-tree$(X) git-unpack-file$(X) git-unpack-objects$(X)	\
 +	git-update-index$(X) git-update-server-info$(X)			\
 +	git-upload-pack$(X) git-verify-pack$(X) git-write-tree$(X)	\
 +	git-update-ref$(X) $(SIMPLE_PROGRAMS)
  
- # Backward compatibility -- to be removed in 0.99.8
+ # Backward compatibility -- to be removed after 1.0
 -PROGRAMS += git-ssh-pull git-ssh-push
 +PROGRAMS += git-ssh-pull$(X) git-ssh-push$(X)
  
  PYMODULES = \
  	gitMergeCommon.py