pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/submodule.h b/submodule.h
index 4c0269d67933659da5ff81e53c21b5f25ca8cf9d..233696555e913d20b6a6c7c21942586c93595541 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -3,6 +3,8 @@
 
 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);
 
 #endif