Merge branch 'jc/grep'
commitefca578eec57869994da0982e05dcf1dee0bc213
authorJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:12:06 +0000 (15 18:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 16 May 2006 01:12:06 +0000 (15 18:12 -0700)
tree21d7c2164b8f05467ded195b302841d135f08a38
parent05f743f328e56780fb86c57da65f41df6e3b19a3
parentf66475199cbf50d9da9db617a280aac3196b2250
Merge branch 'jc/grep'

* jc/grep: (22 commits)
  Fix silly typo in new builtin grep
  builtin-grep: unparse more command line options.
  builtin-grep: use external grep when we can take advantage of it
  builtin-grep: -F (--fixed-strings)
  builtin-grep: -w fix
  builtin-grep: typofix
  builtin-grep: tighten argument parsing.
  builtin-grep: documentation
  Teach -f <file> option to builtin-grep.
  builtin-grep: -L (--files-without-match).
  builtin-grep: binary files -a and -I
  builtin-grep: terminate correctly at EOF
  builtin-grep: tighten path wildcard vs tree traversal.
  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.
  builtin-grep: printf %.*s length is int, not ptrdiff_t.
  builtin-grep: do not use setup_revisions()
  builtin-grep: support '-l' option.
  ...
Makefile
builtin.h
git.c