diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-27 02:25:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-27 02:25:40 +0000 |
| commit | 45c04e4c69849ced101c5be53ec325664f59cfca (patch) | |
| tree | 46f9591f50782d82b8913fa844cbee1becaf4e8f /doc/source | |
| parent | 760630415936694289b9edf6526ecb16a0014fb6 (diff) | |
| parent | 26b9b0e2fb167e27f1ba74f0d3a6542f37c69d55 (diff) | |
| download | zuul-45c04e4c69849ced101c5be53ec325664f59cfca.tar.gz | |
Merge "Add rebase-merge merge mode"
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/config/project.rst | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/source/config/project.rst b/doc/source/config/project.rst index af3faa943..04d61b5d3 100644 --- a/doc/source/config/project.rst +++ b/doc/source/config/project.rst @@ -138,13 +138,20 @@ pipeline. .. value:: cherry-pick Cherry-picks each change onto the branch rather than - performing any merges. This is not supported by Github and GitLab. + performing any merges. This is not supported by GitHub and GitLab. .. value:: squash-merge Squash merges each change onto the branch. This maps to the merge mode ``squash`` in GitHub and GitLab. + .. value:: rebase + + Rebases the changes onto the branch. This is only supported + by GitHub and maps to the ``rebase`` merge mode (but + does not alter committer information in the way that GitHub + does in the repos that Zuul prepares for jobs). + .. attr:: vars :default: None |