![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:56 +0000 (09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:56 +0000 (09:35 -0700) | ||
| commit | 2a33735a7648216fe4c4bc4de1a5bd433147db9e | |
| tree | 52788fbd03f2fc0be9a9a814403a9c1b1086d65d | tree | snapshot |
| parent | 0601f1b3a780b24a48a61a7c0f87de08fc855e53 | commit | diff |
| parent | bf1dfc31032bf6195be63dd92d0b67906e4ff4f8 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |