git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Sat, 2 Apr 2011 00:56:27 +0000 (17:56 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Sat, 2 Apr 2011 00:56:27 +0000 (17:56 -0700)
commit	b966427b53b246e722df1e5502b9145eb9dd063a
tree	64df791944fd20ba8c49dc5043aa25681f07e1c7	tree \| snapshot
parent	6c80cd298a9f2f36ae4e741cf65d94b7c184fb82	commit \| diff
parent	b22520a37c8472751f2c4b3da9b5bc4e5aa5a0a3	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
builtin/grep.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
builtin/grep.c	diff1 \|	diff2 \|	blob \| history