X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=submodule.h;h=b0a571c7f0b454ab0b5d7736aa561baec467af89;hb=68d03e4a6e448aa557f52adef92595ac4d6cd4bd;hp=233696555e913d20b6a6c7c21942586c93595541;hpb=8165952517bf82b6a632cefc047ad14f36a74b25;p=git.git

diff --git a/submodule.h b/submodule.h
index 233696555..b0a571c7f 100644
--- a/submodule.h
+++ b/submodule.h
@@ -1,10 +1,15 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
+struct diff_options;
+
+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);
+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