From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 May 2006 00:21:35 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~98
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8a24f2fae0a08d5832318b62cb279fd02f1bdf5a?hp=-c

Merge branch 'master' into next

* master:
Remove old "git-grep.sh" remnants
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base
---

8a24f2fae0a08d5832318b62cb279fd02f1bdf5a
diff --combined Makefile
index 55d193780f,9ba608c805..daa3fcea18
--- a/Makefile
+++ b/Makefile
@@@ -124,7 -124,7 +124,7 @@@ SCRIPT_SH = 
  	git-tag.sh git-verify-tag.sh \
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
- 	git-merge-resolve.sh git-merge-ours.sh git-grep.sh \
+ 	git-merge-resolve.sh git-merge-ours.sh \
  	git-lost-found.sh
  
  SCRIPT_PERL = \
@@@ -169,7 -169,8 +169,8 @@@ PROGRAMS = 
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
  
  BUILT_INS = git-log$X git-whatchanged$X git-show$X \
- 	git-count-objects$X git-diff$X git-push$X
+ 	git-count-objects$X git-diff$X git-push$X \
+ 	git-grep$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@@ -206,7 -207,7 +207,7 @@@ DIFF_OBJS = 
  	diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -	blob.o commit.o connect.o csum-file.o base85.o \
 +	blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
  	date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o \
  	quote.o read-cache.o refs.o run-command.o \
@@@ -609,9 -610,6 +610,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
  	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
  	for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done