Merge branch 'ps/grep-help-all-callback-arg'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2015 22:28:34 +0000 (15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Apr 2015 22:28:34 +0000 (15:28 -0700)
Code clean-up.

* ps/grep-help-all-callback-arg:
  grep: correctly initialize help-all option

1  2 
builtin/grep.c

diff --cc builtin/grep.c
Simple merge