From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Sep 2010 20:49:03 +0000 (-0700)
Subject: Merge branch 'jc/pickaxe-grep'
X-Git-Tag: v1.7.4-rc0~205
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3c16ee454effda5ec8033ab665249710f622699;p=git.git

Merge branch 'jc/pickaxe-grep'

* 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
---

b3c16ee454effda5ec8033ab665249710f622699