Merge branch 'nd/grep-exclude-standard-help-fix'
commita3eea73cc8370a3feeb9ca48ef88594d79c1ce9d
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:27 +0000 (6 15:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Mar 2015 23:02:27 +0000 (6 15:02 -0800)
treedf585bdd61cce1d5d5a1603dc333b7c90513e666
parent34e4e05b5169ad0b94176aef188e7f704a75bd93
parent77fdb8a82cc624bb3c720b87725abae4d0df5073
Merge branch 'nd/grep-exclude-standard-help-fix'

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