Merge branch 'ss/svnimport'

diff --git a/config.c b/config.c
index dd2de6e38e8d68d8622ad542e5c73cbcffeceeac..dc3148d4566205858869973804de1c2ddb19e981 100644 (file)
--- a/config.c
+++ b/config.c
@@ -426,6 +426,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.editor")) {
+               editor_program = xstrdup(value);
+               return 0;
+       }
+
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }