Skip to content

Commit

Permalink
Merge branch 'jc/logs'
Browse files Browse the repository at this point in the history
* jc/logs:
  builtin-log/whatchanged/show: make them official.
  • Loading branch information
Junio C Hamano committed May 4, 2006
2 parents 476d239 + 7b763f7 commit 5892fc6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 34 deletions.
9 changes: 3 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 = \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 $< $@

Expand Down
28 changes: 0 additions & 28 deletions git-whatchanged.sh

This file was deleted.

0 comments on commit 5892fc6

Please sign in to comment.