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 /zuul/model.py | |
| parent | 760630415936694289b9edf6526ecb16a0014fb6 (diff) | |
| parent | 26b9b0e2fb167e27f1ba74f0d3a6542f37c69d55 (diff) | |
| download | zuul-45c04e4c69849ced101c5be53ec325664f59cfca.tar.gz | |
Merge "Add rebase-merge merge mode"
Diffstat (limited to 'zuul/model.py')
| -rw-r--r-- | zuul/model.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zuul/model.py b/zuul/model.py index 7269dee24..100785885 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -55,13 +55,15 @@ from zuul.zk.components import COMPONENT_REGISTRY MERGER_MERGE = 1 # "git merge" MERGER_MERGE_RESOLVE = 2 # "git merge -s resolve" MERGER_CHERRY_PICK = 3 # "git cherry-pick" -MERGER_SQUASH_MERGE = 4 # "git merge --squash" +MERGER_SQUASH_MERGE = 4 # "git merge --squash" +MERGER_REBASE = 5 # "git rebase" MERGER_MAP = { 'merge': MERGER_MERGE, 'merge-resolve': MERGER_MERGE_RESOLVE, 'cherry-pick': MERGER_CHERRY_PICK, 'squash-merge': MERGER_SQUASH_MERGE, + 'rebase': MERGER_REBASE, } PRECEDENCE_NORMAL = 0 |