From: Junio C Hamano <junkio@cox.net>
Date: Tue, 2 May 2006 06:16:35 +0000 (-0700)
Subject: Merge branch 'jc/logs' into next
X-Git-Tag: v1.4.1-rc1~153
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=064c5bceeea4ab36434d6091be0cb94dbf87d0a2;p=git.git

Merge branch 'jc/logs' into next

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

064c5bceeea4ab36434d6091be0cb94dbf87d0a2
diff --cc Makefile
index b2b8b5d8a,5d19820a0..ef1c36ea2
--- a/Makefile
+++ b/Makefile
@@@ -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-diff$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)