Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/pager.c b/pager.c
index 3bfed025996bbdc31aebd4a7b096236c538a4e75..8bac9d990381f5664333a92f68b0b8cd97d43855 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -31,8 +31,11 @@ void setup_pager(void)
 
        if (!isatty(1))
                return;
-       if (!pager)
+       if (!pager) {
+               if (!pager_program)
+                       git_config(git_default_config);
                pager = pager_program;
+       }
        if (!pager)
                pager = getenv("PAGER");
        if (!pager)