git.tremily.us Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 82cd835 80235ba)

author	Junio C Hamano <gitster@pobox.com>
	Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
commit	6b45b8c088f21566cd9cb7839f8421bf616382a2
tree	cfafac45e083d85e011aef8e6a77b12b6d1b103e	tree \| snapshot
parent	82cd8358e8203fa02da18e8ee71449cb45c4157d	commit \| diff
parent	80235ba79ef43349f455cce869397b3e726f4058	commit \| diff

Merge branch 'jc/grep-author-all-match-implicit'

* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union

builtin-grep.c	diff1 \|	diff2 \|	blob \| history
builtin-rev-list.c	diff1 \|	diff2 \|	blob \| history
grep.c	diff1 \|	diff2 \|	blob \| history
grep.h	diff1 \|	diff2 \|	blob \| history
revision.c	diff1 \|	diff2 \|	blob \| history
t/t7002-grep.sh	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker