From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 May 2011 07:00:07 +0000 (-0700)
Subject: Merge branch 'mk/grep-pcre'
X-Git-Tag: v1.7.6-rc0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be653d6cb87d17c1d70d31cb7cfcb004d48def7b;p=git.git

Merge branch 'mk/grep-pcre'

* mk/grep-pcre:
  git-grep: Fix problems with recently added tests
  git-grep: Update tests (mainly for -P)
  Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
  git-grep: update tests now regexp type is "last one wins"
  git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
  git-grep: Bail out when -P is used with -F or -E
  grep: Add basic tests
  configure: Check for libpcre
  git-grep: Learn PCRE
  grep: Extract compile_regexp_failed() from compile_regexp()
  grep: Fix a typo in a comment
  grep: Put calls to fixmatch() and regmatch() into patmatch()
  contrib/completion: --line-number to git grep
  Documentation: Add --line-number to git-grep synopsis
---

be653d6cb87d17c1d70d31cb7cfcb004d48def7b