X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=a0d2ce13994c1a8751bf7b207671e95c5bc5db97;hb=ac78e548049f4e86b38368d2c4b4dbb546c64ac6;hp=4b435e8b1933222da02f9e4cf2c28d2fef44d292;hpb=9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4;p=git.git

diff --git a/diff.h b/diff.h
index 4b435e8b1..a0d2ce139 100644
--- a/diff.h
+++ b/diff.h
@@ -56,7 +56,10 @@ 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,
+		 exit_with_status:1;
 	int context;
 	int break_opt;
 	int detect_rename;
@@ -170,8 +173,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" \