From: Junio C Hamano <junkio@cox.net>
Date: Mon, 25 Sep 2006 02:53:52 +0000 (-0700)
Subject: Merge branch 'jc/filter-commit'
X-Git-Tag: v1.4.3-rc1~43
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b0ed9eafb35b2330d5a96be79307f0e65547febb;p=git.git

Merge branch 'jc/filter-commit'

* jc/filter-commit:
  git log: Unify header_filter and message_filter into one.
  Update grep internal for grepping only in head/body
  git-log --author and --committer are not left-anchored by default
  rev-list: fix segfault with --{author,committer,grep}
  revision traversal: --author, --committer, and --grep.
  revision traversal: prepare for commit log match.
  builtin-grep: make pieces of it available as library.
---

b0ed9eafb35b2330d5a96be79307f0e65547febb
diff --cc Makefile
index 4a8cd2260,b15aa9dbb..51fbe6aa8
--- a/Makefile
+++ b/Makefile
@@@ -254,9 -252,9 +254,9 @@@ LIB_OBJS = 
  	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 revision.o pager.o tree-walk.o xdiff-interface.o \
- 	write_or_die.o trace.o list-objects.o \
+ 	write_or_die.o trace.o list-objects.o grep.o \
  	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
 -	color.o wt-status.o
 +	color.o wt-status.o archive-zip.o
  
  BUILTIN_OBJS = \
  	builtin-add.o \