commit 0befdb8a35f26a1423107d181ecf08c48fb05229 Author: rl1987 rl1987@sdf.lonestar.org Date: Fri Mar 8 18:50:49 2019 +0200
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 31f44f84a..176b7c9bb 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 }