diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
| commit | b65327ff661b87991566314cf07088a7e789b69b (patch) | |
| tree | 75da1c79db8165ee6b3676b784a0d567551cb82d /.buildkite/merge_base_branch.sh | |
| parent | better logging (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b65327ff661b87991566314cf07088a7e789b69b.tar.xz | |
Merge branch 'develop' into rav/saml_mapping_work
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 |