Merge branch 'fk/threaded-grep'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jan 2010 08:46:45 +0000 (00:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jan 2010 08:46:45 +0000 (00:46 -0800)
* fk/threaded-grep:
  Threaded grep
  grep: expose "status-only" feature via -q

1  2 
grep.c

diff --cc grep.c
Simple merge