diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:49:03 -0700 |
| commit | b3c16ee454effda5ec8033ab665249710f622699 (patch) | |
| tree | 9c50b0b2452c5332e7f37d769f5eec5484499e0e /diffcore.h | |
| parent | ae893e097ecbcbd8c6bea50017eb8cedddc5eaba (diff) | |
| parent | bf1dfc31032bf6195be63dd92d0b67906e4ff4f8 (diff) | |
| download | git-b3c16ee454effda5ec8033ab665249710f622699.tar.xz | |
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
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 8b3241ad13..b8f1fdecf4 100644 --- a/diffcore.h +++ b/diffcore.h @@ -107,7 +107,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *); extern void diffcore_break(int); extern void diffcore_rename(struct diff_options *); extern void diffcore_merge_broken(void); -extern void diffcore_pickaxe(const char *needle, int opts); +extern void diffcore_pickaxe(struct diff_options *); extern void diffcore_order(const char *orderfile); #define DIFF_DEBUG 0 |