aboutsummaryrefslogtreecommitdiff
path: root/scripts/git
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2019-03-08 18:50:49 +0200
committerrl1987 <rl1987@sdf.lonestar.org>2019-03-10 18:28:07 +0200
commit0befdb8a35f26a1423107d181ecf08c48fb05229 (patch)
tree01c50348a9501c98989dc4a9bfbee7ef54975c9c /scripts/git
parent537692c1e37cf40decbe4a93e6a47b69fae9885d (diff)
downloadtor-0befdb8a35f26a1423107d181ecf08c48fb05229.tar.gz
tor-0befdb8a35f26a1423107d181ecf08c48fb05229.zip
Disable git diff pagination
Diffstat (limited to 'scripts/git')
-rwxr-xr-xscripts/git/post-merge.git-hook2
1 files changed, 1 insertions, 1 deletions
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
}