diff options
| author | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:02:09 +0100 |
|---|---|---|
| committer | Olivier Wilkinson (reivilibre) <olivier@librepush.net> | 2019-08-29 15:02:09 +0100 |
| commit | 60481031f2f1e43aaedc96a33441bfcf15262330 (patch) | |
| tree | b7f1e9e461e3034b1ca0fd75e6ea4ea185986cfb /.buildkite/merge_base_branch.sh | |
| parent | Count total_events and total_event_bytes within the loop. (diff) | |
| parent | Merge branch 'develop' into rei/rss_target (diff) | |
| download | synapse-60481031f2f1e43aaedc96a33441bfcf15262330.tar.xz | |
Merge branch 'rei/rss_target' into rei/rss_inc5 github/rei/rss_inc5 rei/rss_inc5
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 |