Merge branch 'ns/send-email-no-chain-reply-to'

diff --git a/var.c b/var.c
index b502487e536d76d10370182427fb0f4ab8af8a7b..d9892f85ce954883427ac4f61d9de9d591c0827c 100644 (file)
--- a/var.c
+++ b/var.c
@@ -18,6 +18,15 @@ static const char *editor(int flag)
        return pgm;
 }
 
+static const char *pager(int flag)
+{
+       const char *pgm = git_pager();
+
+       if (!pgm)
+               pgm = "cat";
+       return pgm;
+}
+
 struct git_var {
        const char *name;
        const char *(*read)(int);
@@ -26,6 +35,7 @@ static struct git_var git_vars[] = {
        { "GIT_COMMITTER_IDENT", git_committer_info },
        { "GIT_AUTHOR_IDENT",   git_author_info },
        { "GIT_EDITOR", editor },
+       { "GIT_PAGER", pager },
        { "", NULL },
 };