summary refs log tree commit diff
path: root/.circleci/merge_base_branch.sh
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-11 14:11:30 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-11 14:12:22 +0000
commit2755a0d48a6ac290ee54ef402eb6947b0858558d (patch)
tree88217979bbeaaa7eb75d42db8056b38af07f9742 /.circleci/merge_base_branch.sh
parentMerge pull request #4260 from matrix-org/rav/python3 (diff)
downloadsynapse-2755a0d48a6ac290ee54ef402eb6947b0858558d.tar.xz
Disable pager for ci script
... otherwise it hangs
Diffstat (limited to '.circleci/merge_base_branch.sh')
-rwxr-xr-x.circleci/merge_base_branch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh

index b2c8c40f4c..4c19fa70d7 100755 --- a/.circleci/merge_base_branch.sh +++ b/.circleci/merge_base_branch.sh
@@ -20,7 +20,7 @@ else fi # Show what we are before -git show -s +git --no-pager show -s # Set up username so it can do a merge git config --global user.email bot@matrix.org @@ -31,4 +31,4 @@ git fetch -u origin $GITBASE git merge --no-edit origin/$GITBASE # Show what we are after. -git show -s +git --no-pager show -s