From: Junio C Hamano <junkio@cox.net>
Date: Thu, 4 May 2006 07:04:32 +0000 (-0700)
Subject: Merge branch 'jc/logs'
X-Git-Tag: v1.4.0-rc1~181
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5892fc6504dd23d7cf9415afb13bae8a61d6c70e;p=git.git

Merge branch 'jc/logs'

* jc/logs:
  builtin-log/whatchanged/show: make them official.
---

5892fc6504dd23d7cf9415afb13bae8a61d6c70e
diff --cc Makefile
index fea20cce7,5d19820a0..a3f7e92d0
--- a/Makefile
+++ b/Makefile
@@@ -115,13 -115,13 +115,13 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  SCRIPT_SH = \
  	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
  	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
 -	git-count-objects.sh git-diff.sh git-fetch.sh \
 +	git-fetch.sh \
  	git-format-patch.sh git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
 -	git-prune.sh git-pull.sh git-push.sh git-rebase.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 \
@@@ -167,8 -167,7 +167,8 @@@ 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
++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
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)