Merge branch 'nd/grep-exclude-standard-help-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:06 +0000 (22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:06 +0000 (22:56 -0700)
Description given by "grep -h" for its --exclude-standard option
was phrased poorly.

* nd/grep-exclude-standard-help-fix:
grep: correct help string for --exclude-standard

1  2 
builtin/grep.c
diff --cc builtin/grep.c
Simple merge