From: Junio C Hamano Date: Tue, 2 May 2006 23:15:29 +0000 (-0700) Subject: Merge branch 'jc/grep' into next X-Git-Tag: v1.4.1-rc1~146 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc71b89fb61fd2ca98dad481cc44671e7680f9ce;p=git.git Merge branch 'jc/grep' into next * jc/grep: builtin-grep: support -w (--word-regexp). builtin-grep: support -c (--count). builtin-grep: allow more than one patterns. builtin-grep: allow - and -[ABC] notation for context lines. --- fc71b89fb61fd2ca98dad481cc44671e7680f9ce