From: Junio C Hamano <junkio@cox.net>
Date: Tue, 11 Apr 2006 02:44:35 +0000 (-0700)
Subject: Merge branch 'jc/withraw' into next
X-Git-Tag: v1.3.0-rc4~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b32ee2381deb414378a76cae213a4fe633f8fcc?hp=-c

Merge branch 'jc/withraw' into next

* 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
---

6b32ee2381deb414378a76cae213a4fe633f8fcc
diff --combined Makefile
index b2721469a7,c0409f35e3..61dd8a20ae
--- a/Makefile
+++ b/Makefile
@@@ -116,7 -116,7 +116,7 @@@ SCRIPT_SH = 
  	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
  	git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
  	git-count-objects.sh git-diff.sh git-fetch.sh \
- 	git-format-patch.sh git-log.sh git-ls-remote.sh \
+ 	git-format-patch.sh git-ls-remote.sh \
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
@@@ -167,8 -167,10 +167,10 @@@ PROGRAMS = 
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
+ BUILT_INS = git-log$X
+ 
  # what 'all' will build and 'install' will install, in gitexecdir
- ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
+ ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(BUILT_INS) $(SCRIPTS)
  
  # Backward compatibility -- to be removed after 1.0
  PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@@ -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 \
@@@ -461,6 -463,9 +463,9 @@@ git$X: git.c common-cmds.h $(GITLIBS
  		$(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
  		$(ALL_LDFLAGS) $(LIBS)
  
+ $(BUILT_INS): git$X
+ 	rm -f $@ && ln git$X $@
+ 
  common-cmds.h: Documentation/git-*.txt
  	./generate-cmdlist.sh > $@