Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/merge-base.c b/merge-base.c
index e73fca7453e8141b3f371a1aeba483c9ed946ccc..07f5ab4d1c72afeac5e3f193cefe91801ee9a9c9 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -237,6 +237,7 @@ int main(int argc, char **argv)
        unsigned char rev1key[20], rev2key[20];
 
        setup_git_directory();
+       git_config(git_default_config);
 
        while (1 < argc && argv[1][0] == '-') {
                char *arg = argv[1];