Merge branch 'ma/lockfile-fixes'

diff --git a/config.h b/config.h
index 456b3d134d3ed187b80b5941c20690763f3eab35..a49d26441622508fd3c6560ac9784e84541c10dc 100644 (file)
--- a/config.h
+++ b/config.h
@@ -70,6 +70,8 @@ extern int git_config_set_multivar_in_file_gently(const char *, const char *, co
 extern void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
 extern int git_config_rename_section(const char *, const char *);
 extern int git_config_rename_section_in_file(const char *, const char *, const char *);
+extern int git_config_copy_section(const char *, const char *);
+extern int git_config_copy_section_in_file(const char *, const char *, const char *);
 extern const char *git_etc_gitconfig(void);
 extern int git_env_bool(const char *, int);
 extern unsigned long git_env_ulong(const char *, unsigned long);