Merge branch 'jc/withraw' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 02:44:35 +0000 (19:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 02:44:35 +0000 (19:44 -0700)
* jc/withraw:
  diff-* --patch-with-raw
  Retire git-log.sh (take#2)
  Retire git-log.sh
  Retire diffcore-pathspec.
  Improve the git-diff-tree -c/-cc documentation

1  2 
Makefile

diff --cc Makefile
+++ b/Makefile
@@@ -194,12 -196,12 +196,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 \