X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=submodule.h;h=4729023aa5bbd7d7c95981b995c379407ba6423d;hb=c14f3727913a67835ad38d17edcbfe4e1c94e9a7;hp=dbda270873171c41f20c0f07b70773ce67c6a303;hpb=e760924cbeb19c6e45febdb31d9d6c95deaf2b43;p=thirdparty%2Fgit.git

diff --git a/submodule.h b/submodule.h
index dbda270873..4729023aa5 100644
--- a/submodule.h
+++ b/submodule.h
@@ -1,10 +1,24 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
+struct diff_options;
+
+void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
+		const char *path);
+int submodule_config(const char *var, const char *value, void *cb);
+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);
+void set_config_fetch_recurse_submodules(int value);
+int fetch_populated_submodules(int num_options, const char **options,
+			       const char *prefix, int ignore_config,
+			       int quiet);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
+int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
+		    const unsigned char a[20], const unsigned char b[20]);
 
 #endif