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

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 89cd4aa 80235ba)

author	Junio C Hamano <gitster@pobox.com>
	Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800)
commit	1f54d693fda851a1df81e2b6c85f1c72f4633916
tree	64740b80a9b5509de9d5bbbb5290a4603a730673	tree \| snapshot
parent	89cd4aa8624de4fa80469ab9ef8482f44b2cc2db	commit \| diff
parent	80235ba79ef43349f455cce869397b3e726f4058	commit \| diff

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

* 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