Merge branch 'maint'

diff --git a/diff.h b/diff.h
index 9fd6d447d4c62e158c941a736e547c7e516cdd93..4546aad219742e4ad878937dbd05436c93d298b9 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -60,11 +60,13 @@ struct diff_options {
                 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;