projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec4b93e 7839a25)
Merge branch 'jc/grep' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 23:15:29 +0000 (16:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 23:15:29 +0000 (16:15 -0700)
* 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.


Trivial merge
The core git plumbing