From: Junio C Hamano <junkio@cox.net>
Date: Tue, 13 Sep 2005 05:02:42 +0000 (-0700)
Subject: Merge branch 'master' of .
X-Git-Tag: v0.99.7^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3db6b224cf36748b969acdd96b9fb2de641cd641?hp=-c

Merge branch 'master' of .
---

3db6b224cf36748b969acdd96b9fb2de641cd641
diff --combined Makefile
index 3f699864ea,9c2bdd642b..e2bbcb590e
--- a/Makefile
+++ b/Makefile
@@@ -40,7 -40,7 +40,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.6
 +GIT_VERSION = 0.99.7
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
@@@ -76,7 -76,7 +76,7 @@@ SCRIPT_SH = 
  	git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
  	git-applymbox.sh git-applypatch.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
- 	git-merge-resolve.sh
+ 	git-merge-resolve.sh git-grep.sh
  
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \