author | Junio C Hamano <junkio@cox.net> | |
Tue, 2 May 2006 23:15:29 +0000 (16:15 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 2 May 2006 23:15:29 +0000 (16:15 -0700) | ||
commit | fc71b89fb61fd2ca98dad481cc44671e7680f9ce | |
tree | a1c836b0f358a1fc8563b6722bdd043887532ba6 | tree | snapshot |
parent | ec4b93ee753db39fbbca857758b0cb9d0f9200eb | commit | diff |
parent | 7839a25eab7177024b809fbb3796907e3eed17c1 | commit | diff |
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 -<n> and -[ABC]<n> notation for context lines.
* jc/grep:
builtin-grep: support -w (--word-regexp).
builtin-grep: support -c (--count).
builtin-grep: allow more than one patterns.
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.