Merge branch 'maint'

diff --git a/config.c b/config.c
index 8b6cf1aaa55a510bffa1d0b8a143e23a6883d45c..0ff413b804afc1ec042ed5190ae4f9055a17ea87 100644 (file)
--- a/config.c
+++ b/config.c
@@ -394,6 +394,8 @@ int git_config(config_fn_t fn)
         * config file otherwise. */
        filename = getenv(CONFIG_ENVIRONMENT);
        if (!filename) {
+               if (!access(ETC_GITCONFIG, R_OK))
+                       ret += git_config_from_file(fn, ETC_GITCONFIG);
                home = getenv("HOME");
                filename = getenv(CONFIG_LOCAL_ENVIRONMENT);
                if (!filename)