From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Apr 2006 23:44:59 +0000 (-0700)
Subject: Merge branch 'master' into jc/diff
X-Git-Tag: v1.3.0-rc4~18^2~3
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6d46a23bf6e009487166f044b8c759aa734b8f90;p=git.git

Merge branch 'master' into jc/diff

* master:
  Make "--parents" logs also be incremental
  Retire diffcore-pathspec.
  Improve the git-diff-tree -c/-cc documentation
---

6d46a23bf6e009487166f044b8c759aa734b8f90
diff --cc Makefile
index b2721469,a979205e..34a8c14d
--- a/Makefile
+++ b/Makefile
@@@ -194,12 -194,12 +194,12 @@@ LIB_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 \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -	tree-walk.h
 +	tree-walk.h log-tree.h
  
  DIFF_OBJS = \
- 	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+ 	diff.o diffcore-break.o diffcore-order.o \
  	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
 -	diffcore-delta.o
 +	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
  	blob.o commit.o connect.o csum-file.o \