X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=submodule.h;h=386f410a66d9c431a61c0e26c773f1b3452f0d09;hb=5501bf854ce6a3847ef0de6f6aa63f6b93e82b67;hp=6fd3bb40702e5fb905eb4ae519d487e3c9f40073;hpb=061219fa7cf1063ac7f0dace55e8d175c7a91879;p=git.git

diff --git a/submodule.h b/submodule.h
index 6fd3bb407..386f410a6 100644
--- a/submodule.h
+++ b/submodule.h
@@ -3,11 +3,17 @@
 
 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);
 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