X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=9fd6d447d4c62e158c941a736e547c7e516cdd93;hb=11a264050f61bb15c413cced058db2ac96fd96f9;hp=a0d2ce13994c1a8751bf7b207671e95c5bc5db97;hpb=e94b4d2f2a3a9b2aaaac15c33d5d31f76531ecbf;p=git.git

diff --git a/diff.h b/diff.h
index a0d2ce139..9fd6d447d 100644
--- a/diff.h
+++ b/diff.h
@@ -55,10 +55,12 @@ 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,
+		 allow_external:1,
 		 exit_with_status:1;
 	int context;
 	int break_opt;
@@ -154,8 +156,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