Implement automatic fast-forward merge for submodules

[git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 6fd3bb40702e5fb905eb4ae519d487e3c9f40073..b0a571c7f0b454ab0b5d7736aa561baec467af89 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -9,5 +9,7 @@ void show_submodule_summary(FILE *f, const char *path,
                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