Merge early part of 'jc/combine' branch

diff --git a/blame.c b/blame.c
index 7e88833a37f9a2b7380b96510a331cf376c99264..396defccc728db836732aa140e54620775509760 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -752,6 +752,7 @@ int main(int argc, const char **argv)
        int found_rename;
 
        const char* prefix = setup_git_directory();
+       git_config(git_default_config);
 
        for(i = 1; i < argc; i++) {
                if(options) {