diff --git a/submodule.h b/submodule.h
index dbda270873171c41f20c0f07b70773ce67c6a303..b0a571c7f0b454ab0b5d7736aa561baec467af89 100644 (file)
--- a/submodule.h
+++ b/submodule.h
#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);
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