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

[git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 6fd3bb40702e5fb905eb4ae519d487e3c9f40073..8ac4037b56210d54616dfa68655722b246c26f1b 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -3,6 +3,10 @@
 
 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],