X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=c672277df25a6855e09e642cdf6341841b4dd5a3;hb=51ce34b9923d9b119ac53414584f80e05520abea;hp=7150b90385952373f4fd49eb073d819541cc306d;hpb=e660e3997fbad830e5723336d61883f3a50dbc92;p=git.git

diff --git a/diff.h b/diff.h
index 7150b903..c672277d 100644
--- a/diff.h
+++ b/diff.h
@@ -28,9 +28,12 @@ struct diff_options {
 		 with_raw:1,
 		 with_stat:1,
 		 tree_in_recursive:1,
+		 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;
 	int line_termination;
@@ -75,6 +78,8 @@ struct combine_diff_path {
 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 			      int dense, struct rev_info *);
 
+extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
+
 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 
 extern void diff_addremove(struct diff_options *,
@@ -148,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*);