Code

Merge branch 'jc/pickaxe-grep'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:03 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:49:03 +0000 (13:49 -0700)
* 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

1  2 
diff.c

diff --cc diff.c
Simple merge