From: Junio C Hamano <junkio@cox.net>
Date: Sun, 26 Feb 2006 23:33:49 +0000 (-0800)
Subject: Merge branch 'lt/rev-list' into next
X-Git-Tag: v1.3.0-rc1~54^2~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5233a61955772b4430abb0eb1d03b7fbdd33e6a?ds=inline;hp=-c

Merge branch 'lt/rev-list' into next

* lt/rev-list:
First cut at libifying revlist generation
Merge branch 'maint'
sample hooks template.
Teach the "git" command to handle some commands internally
Use setenv(), fix warnings
contrib/git-svn: version 0.10.0
contrib/git-svn: optimize sequential commits to svn
contrib/git-svn: add show-ignore command
annotate: Use qx{} for pipes on activestate.
annotate: Convert all -| calls to use a helper open_pipe().
annotate: Handle dirty state and arbitrary revisions.
git-fetch: print the new and old ref when fast-forwarding
---

b5233a61955772b4430abb0eb1d03b7fbdd33e6a
diff --combined Makefile
index 26fd9dc132,35754895df..5e93f278fc
--- a/Makefile
+++ b/Makefile
@@@ -165,7 -165,7 +165,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -	git-describe$X git-merge-tree$X
 +	git-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -192,7 -192,7 +192,7 @@@ LIB_FILE=libgit.
  LIB_H = \
  	blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
  	diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
- 	run-command.h strbuf.h tag.h tree.h git-compat-util.h
+ 	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
  
  DIFF_OBJS = \
  	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
@@@ -205,7 -205,7 +205,7 @@@ LIB_OBJS = 
  	quote.o read-cache.o refs.o run-command.o \
  	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 \
+ 	fetch-clone.o revision.o \
  	$(DIFF_OBJS)
  
  LIBS = $(LIB_FILE)