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

Merge branch 'jc/count' into next

* jc/count:
  builtin-count-objects: make it official.
---

a9fb5823236e675165cd91f3651094c967be532e
diff --cc Makefile
index ef1c36ea2,f1592fb6e..bf800b143
--- a/Makefile
+++ b/Makefile
@@@ -115,7 -115,7 +115,7 @@@ 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-fetch.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 \
@@@ -167,8 -167,8 +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 \
 -	git-count-objects$X
 +BUILT_INS = git-log$X git-whatchanged$X git-show$X \
- 	git-diff$X
++	git-count-objects$X git-diff$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)