diff options
| author | a1012112796 <1012112796@qq.com> | 2021-08-31 22:03:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 16:03:45 +0200 |
| commit | cbf05c3f795c1eed999dafe8d0757495e07f1ee2 (patch) | |
| tree | e9b227ef8dd8d836b04bd126806c8a1264b750ee /models | |
| parent | 2bb32006fd560af44426a06f63f83e3c70c3f258 (diff) | |
| download | gitea-cbf05c3f795c1eed999dafe8d0757495e07f1ee2.tar.gz gitea-cbf05c3f795c1eed999dafe8d0757495e07f1ee2.zip | |
Add option to update pull request by `rebase` (#16125)
* add option to update pull request by `rebase`
Signed-off-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/pull.go b/models/pull.go index e8e815385d..ea8f289993 100644 --- a/models/pull.go +++ b/models/pull.go @@ -373,6 +373,8 @@ const ( MergeStyleSquash MergeStyle = "squash" // MergeStyleManuallyMerged pr has been merged manually, just mark it as merged directly MergeStyleManuallyMerged MergeStyle = "manually-merged" + // MergeStyleRebaseUpdate not a merge style, used to update pull head by rebase + MergeStyleRebaseUpdate MergeStyle = "rebase-update-only" ) // SetMerged sets a pull request to merged and closes the corresponding issue |