Merge branch 'sb/submodule-move-nested'

diff --git a/submodule.h b/submodule.h
index 9589f131273d4f04605c8dbf7dcce05aaea606ad..e5526f6aaab93f85d279e89fc33b8e2e8740c32a 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -105,7 +105,6 @@ extern int push_unpushed_submodules(struct oid_array *commits,
                                    const char **refspec, int refspec_nr,
                                    const struct string_list *push_options,
                                    int dry_run);
-extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
 /*
  * Given a submodule path (as in the index), return the repository
  * path of that submodule in 'buf'. Return -1 on error or when the