Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog'

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 93779b06f1a12989a6920cbc2a09170d70e62730..9ba608c805e6a9864414a963422094ae010e4a86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ SCRIPT_SH = \
        git-tag.sh git-verify-tag.sh \
        git-applymbox.sh git-applypatch.sh git-am.sh \
        git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
-       git-merge-resolve.sh git-merge-ours.sh git-grep.sh \
+       git-merge-resolve.sh git-merge-ours.sh \
        git-lost-found.sh
 
 SCRIPT_PERL = \
@@ -169,7 +169,8 @@ PROGRAMS = \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
 
 BUILT_INS = git-log$X git-whatchanged$X git-show$X \
-       git-count-objects$X git-diff$X git-push$X
+       git-count-objects$X git-diff$X git-push$X \
+       git-grep$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)