diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:01:27 +0100 |
| commit | f7ececb0acca62d969c197df66f9864a49a75b78 (patch) | |
| tree | c1254c69f384eb7d3559936f956aa21c7e85755d /.buildkite/merge_base_branch.sh | |
| parent | Merge pull request #5890 from matrix-org/rei/rss_inc3 (diff) | |
| parent | Fix coverage in sytest and use plugins for buildkite (#5922) (diff) | |
| download | synapse-f7ececb0acca62d969c197df66f9864a49a75b78.tar.xz | |
Merge branch 'develop' into rei/rss_target
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 |