Merge branch 'jc/tartree' into jc/builtin-n-tar-tree

diff --git a/diff.h b/diff.h
index bef586d8502f6e78b95cce15456704572ffe8c00..c672277df25a6855e09e642cdf6341841b4dd5a3 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,8 @@ struct diff_options {
                 binary:1,
                 full_index:1,
                 silent_on_remove:1,
-                find_copies_harder:1;
+                find_copies_harder:1,
+                summary:1;
        int context;
        int break_opt;
        int detect_rename;
@@ -152,6 +153,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*);