From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 30 Sep 2012 05:30:56 +0000 (-0700)
Subject: Merge branch 'jc/maint-log-grep-all-match-1' into maint
X-Git-Tag: v1.7.12.2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31d69db340d3d056668cbc278abf01a0a552d9b4;p=git.git

Merge branch 'jc/maint-log-grep-all-match-1' into maint

* jc/maint-log-grep-all-match-1:
  grep.c: make two symbols really file-scope static this time
  t7810-grep: test --all-match with multiple --grep and --author options
  t7810-grep: test interaction of multiple --grep and --author options
  t7810-grep: test multiple --author with --all-match
  t7810-grep: test multiple --grep with and without --all-match
  t7810-grep: bring log --grep tests in common form
  grep.c: mark private file-scope symbols as static
  log: document use of multiple commit limiting options
  log --grep/--author: honor --all-match honored for multiple --grep patterns
  grep: show --debug output only once
  grep: teach --debug option to dump the parse tree
---

31d69db340d3d056668cbc278abf01a0a552d9b4