diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-24 19:53:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-24 19:53:52 -0700 |
| commit | b0ed9eafb35b2330d5a96be79307f0e65547febb (patch) | |
| tree | 2af7dfb166f4f26098acf5ca6cf0289c1375fc23 /Makefile | |
| parent | 700899b624f368af6f2322fc10c6a0350d398694 (diff) | |
| parent | 2d10c555374df257e32848ba6f77fd73d608645f (diff) | |
| download | git-b0ed9eafb35b2330d5a96be79307f0e65547febb.tar.gz | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -234,7 +234,7 @@ LIB_FILE=libgit.a XDIFF_LIB=xdiff/lib.a LIB_H = \ - archive.h blob.h cache.h commit.h csum-file.h delta.h \ + archive.h blob.h cache.h commit.h csum-file.h delta.h grep.h \ diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h @@ -254,7 +254,7 @@ 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 archive-zip.o |