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