X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=a7ee6d8c87887b111ef84b95266e1ff43496e7c3;hb=6718f1f0d07167128c2d23c15081ea5660e865e9;hp=4b435e8b1933222da02f9e4cf2c28d2fef44d292;hpb=6b4318e604ca729d5d7508a744f0155555094fae;p=git.git

diff --git a/diff.h b/diff.h
index 4b435e8b1..a7ee6d8c8 100644
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,11 @@ struct diff_options {
 		 silent_on_remove:1,
 		 find_copies_harder:1,
 		 color_diff:1,
-		 color_diff_words:1;
+		 color_diff_words:1,
+		 has_changes:1,
+		 quiet:1,
+		 allow_external:1,
+		 exit_with_status:1;
 	int context;
 	int break_opt;
 	int detect_rename;
@@ -151,8 +155,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
@@ -170,8 +172,6 @@ extern int diff_setup_done(struct diff_options *);
 
 extern void diffcore_std(struct diff_options *);
 
-extern void diffcore_std_no_resolve(struct diff_options *);
-
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \
 "  -z            output diff-raw with lines terminated with NUL.\n" \