diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-04 00:04:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-04 00:04:32 -0700 |
| commit | 5892fc6504dd23d7cf9415afb13bae8a61d6c70e (patch) | |
| tree | 1d45b95ac4033f64e90a6d654c79a02a020d2d3d /Makefile | |
| parent | 476d23980417ea0b476735d1ad971f9b66b4e032 (diff) | |
| parent | 7b763f7c6536f40090b06c79896a147ba97b0b03 (diff) | |
| download | git-5892fc6504dd23d7cf9415afb13bae8a61d6c70e.tar.gz | |
Merge branch 'jc/logs'
* jc/logs:
builtin-log/whatchanged/show: make them official.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -121,7 +121,7 @@ SCRIPT_SH = \ git-prune.sh git-pull.sh git-rebase.sh \ git-repack.sh git-request-pull.sh git-reset.sh \ git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \ - git-tag.sh git-verify-tag.sh git-whatchanged.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 \ @@ -139,7 +139,7 @@ SCRIPT_PYTHON = \ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ - git-cherry-pick git-show git-status + git-cherry-pick git-status # The ones that do not have to link with lcrypto, lz nor xdiff. SIMPLE_PROGRAMS = \ @@ -167,7 +167,7 @@ PROGRAMS = \ git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \ git-describe$X git-merge-tree$X git-blame$X git-imap-send$X -BUILT_INS = git-log$X \ +BUILT_INS = git-log$X git-whatchanged$X git-show$X \ git-count-objects$X git-diff$X git-push$X # what 'all' will build and 'install' will install, in gitexecdir @@ -510,9 +510,6 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py git-cherry-pick: git-revert cp $< $@ -git-show: git-whatchanged - cp $< $@ - git-status: git-commit cp $< $@ |