rebase --preserve-merges: keep all merge commits including empty ones

diff --git a/submodule.h b/submodule.h
index 9c5e5c0c30676d5dc8be685c97b7d7f303dd7842..e105b0ebe6c06a03af7f82bdfbc9beb66377544f 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -29,6 +29,8 @@ int fetch_populated_submodules(int num_options, const char **options,
 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], int search);
-int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
+int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
+               struct string_list *needs_pushing);
+int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
 
 #endif