diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-08-29 22:19:57 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 22:19:57 +1000 |
| commit | e7011280c7796e437ba34ed97033b120b8556043 (patch) | |
| tree | 7061d4ed497cb6d4ef5742bf563e7daad952d64b /.buildkite/merge_base_branch.sh | |
| parent | Add a link to python's logging config schema (#5926) (diff) | |
| download | synapse-e7011280c7796e437ba34ed97033b120b8556043.tar.xz | |
Fix coverage in sytest and use plugins for buildkite (#5922)
Diffstat (limited to '.buildkite/merge_base_branch.sh')
| -rwxr-xr-x | .buildkite/merge_base_branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh index 26176d6465..eb7219a56d 100755 --- a/.buildkite/merge_base_branch.sh +++ b/.buildkite/merge_base_branch.sh @@ -27,7 +27,7 @@ git config --global user.name "A robot" # Fetch and merge. If it doesn't work, it will raise due to set -e. git fetch -u origin $GITBASE -git merge --no-edit origin/$GITBASE +git merge --no-edit --no-commit origin/$GITBASE # Show what we are after. git --no-pager show -s |