From: Junio C Hamano <junkio@cox.net>
Date: Tue, 30 Aug 2005 02:09:48 +0000 (-0700)
Subject: Merge refs/heads/master from .
X-Git-Tag: v0.99.6^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a034337420a45395b3f68a1f12ca53d8b0652be?hp=-c

Merge refs/heads/master from .
---

7a034337420a45395b3f68a1f12ca53d8b0652be
diff --combined Makefile
index 57d4f1170c,007d42b038..f13ff5aa29
--- a/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.5
 +GIT_VERSION = 0.99.6
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -57,7 -57,7 +57,7 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  
  
  
- SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
+ SCRIPTS=git git-merge-one-file-script git-prune-script \
  	git-pull-script git-tag-script git-resolve-script git-whatchanged \
  	git-fetch-script git-status-script git-commit-script \
  	git-log-script git-shortlog git-cvsimport-script git-diff-script \
@@@ -215,6 -215,7 +215,7 @@@ check
  install: $(PROG) $(SCRIPTS)
  	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
  	$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
+ 	$(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
  	$(MAKE) -C templates install
  	$(MAKE) -C tools install