diff options
| author | John Levon <john.levon@nutanix.com> | 2021-05-14 11:10:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-14 11:10:52 +0100 |
| commit | 83eb5d9c02f7bdbeaf8eb2e21a39c92c715351a4 (patch) | |
| tree | 2c1622afea4f15459c7be48a14b7e35f2953aad1 /.github/settings.yml | |
| parent | c174ca8539a47ea3b87b1d4015a0b9f21c738dad (diff) | |
| download | libvfio-user-83eb5d9c02f7bdbeaf8eb2e21a39c92c715351a4.zip libvfio-user-83eb5d9c02f7bdbeaf8eb2e21a39c92c715351a4.tar.gz libvfio-user-83eb5d9c02f7bdbeaf8eb2e21a39c92c715351a4.tar.bz2 | |
enforce linear, squashed history in master branch (#496)
Due to the CI infrastructure, the logical unit of "keeping the master branch
green" is individual PRs (tests can't be run on intra-PR commits). Therefore, we
need to enforce that PRs are squashed to a single commit when pushing to master,
which also helps keep a clean, meaningful history.
Signed-off-by: John Levon <john.levon@nutanix.com>
Reviewed-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
Diffstat (limited to '.github/settings.yml')
| -rw-r--r-- | .github/settings.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/settings.yml b/.github/settings.yml index 3f8b10f..bc5b5f6 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -38,11 +38,11 @@ repository: # Either `true` to allow merging pull requests with a merge commit, or `false` # to prevent merging pull requests with merge commits. - allow_merge_commit: true + allow_merge_commit: false # Either `true` to allow rebase-merging pull requests, or `false` to prevent # rebase-merging. - allow_rebase_merge: true + allow_rebase_merge: false # Labels: define labels for Issues and Pull Requests #labels: |