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

author	Junio C Hamano <gitster@pobox.com>
	Sat, 3 Apr 2010 19:28:39 +0000 (12:28 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 3 Apr 2010 19:28:39 +0000 (12:28 -0700)
commit	07b838f087a1535e387d5d4a1414b2b545b73265
tree	8779dd5e4854e5dd9c3dbe09daa80eea0ed0c7da	tree \| snapshot
parent	d718dd0732c125306670d61880652f1b596a0c3e	commit \| diff
parent	431d6e7bc85f693fe49a04142a8ab4d2d72b0257	commit \| diff

Merge branch 'rs/threaded-grep-context'

* rs/threaded-grep-context:
grep: enable threading for context line printing

Conflicts:
grep.c

builtin/grep.c	diff1 \|	diff2 \|	blob \| history
grep.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

builtin/grep.c	diff1 \|	diff2 \|	blob \| history
grep.c	diff1 \|	diff2 \|	blob \| history