Merge branch 'jr/grep-en-config'
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:56:27 +0000 (17:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:56:27 +0000 (17:56 -0700)
commitb966427b53b246e722df1e5502b9145eb9dd063a
tree64df791944fd20ba8c49dc5043aa25681f07e1c7
parent6c80cd298a9f2f36ae4e741cf65d94b7c184fb82
parentb22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3
Merge branch 'jr/grep-en-config'

* jr/grep-en-config:
  grep: allow -E and -n to be turned on by default via configuration
Documentation/config.txt
builtin/grep.c