Merge branch 'ds/include-exclude'

diff --git a/submodule.h b/submodule.h
index 9e18e9b80760ad1562682125bc90d08fb6e1c0d3..8072e6d6ddfd847ca8f739e9d8af9b815c43e21d 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -141,8 +141,7 @@ void submodule_unset_core_worktree(const struct submodule *sub);
 void prepare_submodule_repo_env(struct argv_array *out);
 
 #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
-void absorb_git_dir_into_superproject(const char *prefix,
-                                     const char *path,
+void absorb_git_dir_into_superproject(const char *path,
                                      unsigned flags);
 
 /*