aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-17 18:32:03 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-17 18:32:03 -0700
commit4405fb77f466ddd223b999d009a705601a90b0e6 (patch)
tree01b77fb203ac5501d8bb8e0c804b803dbe937c97 /Makefile
parent2874172101600666d30ceae92d27025849509066 (diff)
parent4321134cd85eabc5d4d07a7ce00d4cf6a02c38fb (diff)
downloadgit-4405fb77f466ddd223b999d009a705601a90b0e6.tar.gz
git-4405fb77f466ddd223b999d009a705601a90b0e6.tar.xz
Merge branch 'jc/pack'
* jc/pack: pack-objects: document --revs, --unpacked and --all. pack-objects --unpacked=<existing pack> option. pack-objects: further work on internal rev-list logic. pack-objects: run rev-list equivalent internally. Separate object listing routines out of rev-list
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 69915d865..8467447da 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ XDIFF_LIB=xdiff/lib.a
LIB_H = \
archive.h blob.h cache.h commit.h csum-file.h delta.h \
- diff.h object.h pack.h pkt-line.h quote.h refs.h sideband.h \
+ diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h
@@ -252,7 +252,7 @@ LIB_OBJS = \
server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
- write_or_die.o trace.o \
+ write_or_die.o trace.o list-objects.o \
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
color.o wt-status.o