t/README: start testing porcelainish

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index bef586d8502f6e78b95cce15456704572ffe8c00..b61fdc8f1e4f34b608ed69cbbac6f74b81d47b53 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,9 @@ struct diff_options {
                 binary:1,
                 full_index:1,
                 silent_on_remove:1,
-                find_copies_harder:1;
+                find_copies_harder:1,
+                summary:1,
+                color_diff:1;
        int context;
        int break_opt;
        int detect_rename;
@@ -43,6 +45,8 @@ struct diff_options {
        int rename_limit;
        int setup;
        int abbrev;
+       const char *stat_sep;
+       long xdl_opts;
 
        int nr_paths;
        const char **paths;
@@ -51,6 +55,8 @@ struct diff_options {
        add_remove_fn_t add_remove;
 };
 
+extern const char mime_boundary_leader[];
+
 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 extern void diff_tree_release_paths(struct diff_options *);
 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
@@ -152,6 +158,7 @@ extern int diff_queue_is_empty(void);
 #define DIFF_FORMAT_NAME       4
 #define DIFF_FORMAT_NAME_STATUS        5
 #define DIFF_FORMAT_DIFFSTAT   6
+#define DIFF_FORMAT_CHECKDIFF  7
 
 extern void diff_flush(struct diff_options*);