X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pager.c;h=dcb398da8e703de2999badb976dee7322eff470b;hb=ff989b8d466ee2ec42c69c02e6551add430b8497;hp=280f57f796c84d1c1fd54e295b542c3b33490b3e;hpb=e40e0135f24a140935c218af43d0bf8b7b07067b;p=git.git

diff --git a/pager.c b/pager.c
index 280f57f79..dcb398da8 100644
--- a/pager.c
+++ b/pager.c
@@ -15,10 +15,12 @@ void setup_pager(void)
 {
 	pid_t pid;
 	int fd[2];
-	const char *pager = getenv("PAGER");
+	const char *pager = getenv("GIT_PAGER");
 
 	if (!isatty(1))
 		return;
+	if (!pager)
+		pager = getenv("PAGER");
 	if (!pager)
 		pager = "less";
 	else if (!*pager || !strcmp(pager, "cat"))