diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-23 14:44:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 14:44:31 -0700 |
| commit | 1af0d11283ee34127a4ee877fb753db021d399ea (patch) | |
| tree | 9792099056c1cc157640898576a782086cb860d0 /Makefile | |
| parent | e8cc9cd98e2ecd7fd8bb03e725d470405c8e2b94 (diff) | |
| parent | 217542640ed219c980fff2b3c307c4520120f20f (diff) | |
| download | git-1af0d11283ee34127a4ee877fb753db021d399ea.tar.gz git-1af0d11283ee34127a4ee877fb753db021d399ea.tar.xz | |
Merge branch 'jc/tartree' into jc/builtin-n-tar-tree
* jc/tartree:
built-in tar-tree and remote tar-tree
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -170,9 +170,10 @@ BUILT_INS = git-log$X git-whatchanged$X git-show$X \ git-count-objects$X git-diff$X git-push$X \ git-grep$X git-rev-list$X git-check-ref-format$X \ git-init-db$X git-ls-files$X git-ls-tree$X \ - git-tar-tree$X git-read-tree$X git-commit-tree$X \ + git-read-tree$X git-commit-tree$X \ git-apply$X git-show-branch$X git-diff-files$X \ - git-diff-index$X git-diff-stages$X git-diff-tree$X + git-diff-index$X git-diff-stages$X git-diff-tree$X \ + git-tar-tree$X git-upload-tar$X # what 'all' will build and 'install' will install, in gitexecdir ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) @@ -222,9 +223,10 @@ BUILTIN_OBJS = \ builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ builtin-grep.o builtin-rev-list.o builtin-check-ref-format.o \ builtin-init-db.o builtin-ls-files.o builtin-ls-tree.o \ - builtin-tar-tree.o builtin-read-tree.o builtin-commit-tree.o \ + builtin-read-tree.o builtin-commit-tree.o \ builtin-apply.o builtin-show-branch.o builtin-diff-files.o \ - builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o + builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \ + builtin-tar-tree.o builtin-upload-tar.o GITLIBS = $(LIB_FILE) $(XDIFF_LIB) LIBS = $(GITLIBS) -lz |