diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-01 23:18:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-01 23:18:09 -0700 |
| commit | a9fb5823236e675165cd91f3651094c967be532e (patch) | |
| tree | bef27f7164002c386f137196d594943f5df6716c /Makefile | |
| parent | Merge branch 'jc/logs' into next (diff) | |
| parent | builtin-count-objects: make it official. (diff) | |
| download | tgif-a9fb5823236e675165cd91f3651094c967be532e.tar.xz | |
Merge branch 'jc/count' into next
* jc/count:
builtin-count-objects: make it official.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -115,7 +115,7 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__ 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-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 \ @@ -168,7 +168,7 @@ PROGRAMS = \ git-describe$X git-merge-tree$X git-blame$X git-imap-send$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) |