From 0befdb8a35f26a1423107d181ecf08c48fb05229 Mon Sep 17 00:00:00 2001
From: rl1987 <rl1987@sdf.lonestar.org>
Date: Fri, 8 Mar 2019 18:50:49 +0200
Subject: [PATCH] Disable git diff pagination

---
 scripts/git/post-merge.git-hook | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook
index 31f44f84ab..176b7c9bbd 100755
--- a/scripts/git/post-merge.git-hook
+++ b/scripts/git/post-merge.git-hook
@@ -31,7 +31,7 @@ check_for_script_update() {
         if ! git diff ORIG_HEAD HEAD --exit-code -- "$fullpath" >/dev/null
         then
                 echo "ATTENTION: $1 has changed:"
-                git diff ORIG_HEAD HEAD -- "$fullpath"
+                git --no-pager diff ORIG_HEAD HEAD -- "$fullpath"
         fi
 }