Merge branch 'js/rebase-am'

diff --git a/submodule-config.h b/submodule-config.h
index dc7278eea45deedc33635af50b016e9ee28df7d2..4dc9b0771c3c2c745d737ad228423e06d55e84c0 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -48,6 +48,8 @@ const struct submodule *submodule_from_path(struct repository *r,
                                            const struct object_id *commit_or_tree,
                                            const char *path);
 void submodule_free(struct repository *r);
+int print_config_from_gitmodules(struct repository *repo, const char *key);
+int config_set_in_gitmodules_file_gently(const char *key, const char *value);
 
 /*
  * Returns 0 if the name is syntactically acceptable as a submodule "name"