Merge branch 'en/rebase-against-rebase-fix'

[git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 233696555e913d20b6a6c7c21942586c93595541..8ac4037b56210d54616dfa68655722b246c26f1b 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -1,10 +1,17 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
+struct diff_options;
+
+void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
+               const char *path);
+void gitmodules_config();
+int parse_submodule_config_option(const char *var, const char *value);
+void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 void show_submodule_summary(FILE *f, const char *path,
                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule,
                const char *del, const char *add, const char *reset);
-int is_submodule_modified(const char *path);
+unsigned is_submodule_modified(const char *path, int ignore_untracked);
 
 #endif