X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.h;h=6a71013dc63fc0912fd4f3d27f70ae909917f1f6;hb=72d9b222a940c93a8d915c26a4d5d077e23be871;hp=968a8dce95b93d76e299c070ffa3587c31fcc965;hpb=01ddb1ff41cdbd98e257aa4c119a7d51a21f80be;p=git.git

diff --git a/diff.h b/diff.h
index 968a8dce9..6a71013dc 100644
--- a/diff.h
+++ b/diff.h
@@ -69,6 +69,8 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
 #define DIFF_OPT_ALLOW_TEXTCONV      (1 << 21)
 #define DIFF_OPT_DIFF_FROM_CONTENTS  (1 << 22)
 #define DIFF_OPT_SUBMODULE_LOG       (1 << 23)
+#define DIFF_OPT_DIRTY_SUBMODULES    (1 << 24)
+#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
 
 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
@@ -210,6 +212,7 @@ extern int diff_setup_done(struct diff_options *);
 #define DIFF_PICKAXE_REGEX	2
 
 extern void diffcore_std(struct diff_options *);
+extern void diffcore_fix_diff_index(struct diff_options *);
 
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \