mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Add merge style fast-forward-only
(#28954)
With this option, it is possible to require a linear commit history with the following benefits over the next best option `Rebase+fast-forward`: The original commits continue existing, with the original signatures continuing to stay valid instead of being rewritten, there is no merge commit, and reverting commits becomes easier. Closes #24906
This commit is contained in:
12
templates/swagger/v1_json.tmpl
generated
12
templates/swagger/v1_json.tmpl
generated
@@ -19195,6 +19195,11 @@
|
||||
"description": "EditRepoOption options when editing a repository's properties",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"allow_fast_forward_only_merge": {
|
||||
"description": "either `true` to allow fast-forward-only merging pull requests, or `false` to prevent fast-forward-only merging.",
|
||||
"type": "boolean",
|
||||
"x-go-name": "AllowFastForwardOnly"
|
||||
},
|
||||
"allow_manual_merge": {
|
||||
"description": "either `true` to allow mark pr as merged manually, or `false` to prevent it.",
|
||||
"type": "boolean",
|
||||
@@ -19251,7 +19256,7 @@
|
||||
"x-go-name": "DefaultDeleteBranchAfterMerge"
|
||||
},
|
||||
"default_merge_style": {
|
||||
"description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", or \"squash\".",
|
||||
"description": "set to a merge style to be used by this repository: \"merge\", \"rebase\", \"rebase-merge\", \"squash\", or \"fast-forward-only\".",
|
||||
"type": "string",
|
||||
"x-go-name": "DefaultMergeStyle"
|
||||
},
|
||||
@@ -20650,6 +20655,7 @@
|
||||
"rebase",
|
||||
"rebase-merge",
|
||||
"squash",
|
||||
"fast-forward-only",
|
||||
"manually-merged"
|
||||
]
|
||||
},
|
||||
@@ -22036,6 +22042,10 @@
|
||||
"description": "Repository represents a repository",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"allow_fast_forward_only_merge": {
|
||||
"type": "boolean",
|
||||
"x-go-name": "AllowFastForwardOnly"
|
||||
},
|
||||
"allow_merge_commits": {
|
||||
"type": "boolean",
|
||||
"x-go-name": "AllowMerge"
|
||||
|
Reference in New Issue
Block a user