Merge branch 'ph/checkout'

diff --git a/builtin-commit.c b/builtin-commit.c
index 7434797d1b850b25d13aab8d7aeaf85d02109a61..6a9dc0e30fc23d79df099fbd05b69bacf54238be 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -876,7 +876,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
        }
 }
 
-int git_commit_config(const char *k, const char *v, void *cb)
+static int git_commit_config(const char *k, const char *v, void *cb)
 {
        if (!strcmp(k, "commit.template"))
                return git_config_string(&template_file, k, v);