X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=4546aad219742e4ad878937dbd05436c93d298b9;hb=55246aac6717e86c14f31391ac903ed810d1a9a0;hp=81fa265656fba7e9b8a88f192c7e10bbbd0cc6b3;hpb=3161b4b52112acb6a3eb57f3bf882e8ca131e7d3;p=git.git

diff --git a/diff.h b/diff.h
index 81fa26565..4546aad21 100644
--- a/diff.h
+++ b/diff.h
@@ -55,12 +55,18 @@ struct diff_options {
 		 full_index:1,
 		 silent_on_remove:1,
 		 find_copies_harder:1,
+		 follow_renames:1,
 		 color_diff:1,
 		 color_diff_words:1,
+		 has_changes:1,
+		 quiet:1,
+		 no_index:1,
+		 allow_external:1,
 		 exit_with_status:1;
 	int context;
 	int break_opt;
 	int detect_rename;
+	int skip_stat_unmatch;
 	int line_termination;
 	int output_format;
 	int pickaxe_opts;
@@ -72,8 +78,6 @@ struct diff_options {
 	const char *msg_sep;
 	const char *stat_sep;
 	long xdl_opts;
-	/* 0 - no differences; only meaningful if exit_with_status set */
-	int has_changes;
 
 	int stat_width;
 	int stat_name_width;
@@ -154,8 +158,6 @@ extern void diff_unmerge(struct diff_options *,
 			 unsigned mode,
 			 const unsigned char *sha1);
 
-extern int diff_scoreopt_parse(const char *opt);
-
 #define DIFF_SETUP_REVERSE      	1
 #define DIFF_SETUP_USE_CACHE		2
 #define DIFF_SETUP_USE_SIZE_CACHE	4