X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=0083d92438916a8188656df140ba70d6acc8c6f6;hb=e8a8a4d76b1a609b343a174212655c5e07e00b50;hp=bf2f44d840735684c89f654ee6f3b3a935af2c55;hpb=8577def6fc1dda3f18a284162aba07819fbcbcd4;p=git.git diff --git a/diff.h b/diff.h index bf2f44d84..0083d9243 100644 --- a/diff.h +++ b/diff.h @@ -238,6 +238,9 @@ extern int diff_setup_done(struct diff_options *); #define DIFF_PICKAXE_ALL 1 #define DIFF_PICKAXE_REGEX 2 +#define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ +#define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ + extern void diffcore_std(struct diff_options *); extern void diffcore_fix_diff_index(struct diff_options *); @@ -312,4 +315,6 @@ extern size_t fill_textconv(struct userdiff_driver *driver, extern struct userdiff_driver *get_textconv(struct diff_filespec *one); +extern int parse_rename_score(const char **cp_p); + #endif /* DIFF_H */