Merge branch 'nd/grep-exclude-standard-help-fix' into maint
commit2408f3b74b26580b9f197e4edd96e73b0fba41c5
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:06 +0000 (13 22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:06 +0000 (13 22:56 -0700)
tree0c2bc2fc409ba0733ca8fd4b49df121f57fbe688
parent3af1bcafffb0d462abf6208574059f72ce4d5b48
parent77fdb8a82cc624bb3c720b87725abae4d0df5073
Merge branch 'nd/grep-exclude-standard-help-fix' into maint

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
builtin/grep.c