apply: get rid of --index-info in favor of --build-fake-ancestor

diff --git a/diff.h b/diff.h
index 63738c1dd4c71cb1beacaffea40bf51377a137ea..4546aad219742e4ad878937dbd05436c93d298b9 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -55,15 +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;
@@ -155,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