X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=3027974c1ec74217a58345b4ab48e673ee3db710;hb=667661d46ef3de6ec38d915f048b4008c0b7c27d;hp=7150b90385952373f4fd49eb073d819541cc306d;hpb=5c21ac0e7c475c82039ab604ee9d7d8430889346;p=git.git

diff --git a/diff.h b/diff.h
index 7150b903..3027974c 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 *,