Code

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)
* jr/grep-en-config:
  grep: allow -E and -n to be turned on by default via configuration

1  2 
Documentation/config.txt
builtin/grep.c

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