diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:35 -0700 |
| commit | 8a24f2fae0a08d5832318b62cb279fd02f1bdf5a (patch) | |
| tree | 07a0d71cb9cc6356e633dbaac96a318624b2f500 /Makefile | |
| parent | Merge branch 'np/pack' into next (diff) | |
| parent | Remove old "git-grep.sh" remnants (diff) | |
| download | tgif-8a24f2fae0a08d5832318b62cb279fd02f1bdf5a.tar.xz | |
Merge branch 'master' into next
* master:
Remove old "git-grep.sh" remnants
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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) |