git-commit: do not muck with commit message when no_edit is set.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index a268d16..a02ef28 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -20,7 +20,6 @@ typedef void (*add_remove_fn_t)(struct diff_options *options,
                    const char *base, const char *path);
 
 struct diff_options {
-       const char **paths;
        const char *filter;
        const char *orderfile;
        const char *pickaxe;
@@ -102,6 +101,7 @@ extern int diff_setup_done(struct diff_options *);
 #define DIFF_DETECT_COPY       2
 
 #define DIFF_PICKAXE_ALL       1
+#define DIFF_PICKAXE_REGEX     2
 
 extern void diffcore_std(struct diff_options *);