]> granicus.if.org Git - git/commitdiff
Merge branch 'ws/grep-quiet-no-pager' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:11 +0000 (09:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Mar 2015 16:33:11 +0000 (09:33 -0700)
Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless.  Stop doing that.

* ws/grep-quiet-no-pager:
  grep: fix "--quiet" overwriting current output

1  2 
builtin/grep.c

diff --cc builtin/grep.c
Simple merge