summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-13 05:02:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-13 05:02:42 (GMT)
commit3db6b224cf36748b969acdd96b9fb2de641cd641 (patch)
tree09a8b22b46c5e34bfb6ece0429e20cc836a559e8 /Makefile
parentc52b60a2f224e42cb3f6724236bcf6d423128ba6 (diff)
parent2aba319a52b3601cff3f32b60bc28023ee45575d (diff)
downloadgit-3db6b224cf36748b969acdd96b9fb2de641cd641.zip
git-3db6b224cf36748b969acdd96b9fb2de641cd641.tar.gz
git-3db6b224cf36748b969acdd96b9fb2de641cd641.tar.bz2
Merge branch 'master' of .
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3f69986..e2bbcb5 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \