From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Sep 2010 16:35:56 +0000 (-0700)
Subject: Merge branch 'jc/pickaxe-grep' into next
X-Git-Tag: ko-next~225
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2a33735a7648216fe4c4bc4de1a5bd433147db9e;p=git.git

Merge branch 'jc/pickaxe-grep' into next

* jc/pickaxe-grep:
  diff/log -G<pattern>: tests
  git log/diff: add -G<regexp> that greps in the patch text
  diff: pass the entire diff-options to diffcore_pickaxe()
  gitdiffcore doc: update pickaxe description
---

2a33735a7648216fe4c4bc4de1a5bd433147db9e