diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-12-11 14:13:02 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-12-11 14:13:02 +0000 |
| commit | bd52978fd72418b604b7429f602f89927249f633 (patch) | |
| tree | 8bb89bc7770b09c512ce6937c1d79ac33447ffb5 /.circleci/merge_base_branch.sh | |
| parent | Add a welcome page to the static resources (diff) | |
| parent | Disable pager for ci script (diff) | |
| download | synapse-bd52978fd72418b604b7429f602f89927249f633.tar.xz | |
Merge branch 'rav/disable_pager_in_ci' into rav/welcome_page
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 |