diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-12-11 16:23:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 16:23:49 +0100 |
| commit | 1e2b06511254be291f61afeee82d318b76d5276f (patch) | |
| tree | 4cbc1de0e4fd041c92e5a3c6bef0bfa7e0a1465c /.circleci/merge_base_branch.sh | |
| parent | fix upgrade.rst link again (diff) | |
| parent | Disable pager for ci script (diff) | |
| download | synapse-1e2b06511254be291f61afeee82d318b76d5276f.tar.xz | |
Merge pull request #4291 from matrix-org/rav/disable_pager_in_ci
Disable pager for ci script
Diffstat (limited to '.circleci/merge_base_branch.sh')
| -rwxr-xr-x | .circleci/merge_base_branch.sh | 4 |
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 |