diff options
| author | Giteabot <teabot@gitea.io> | 2023-07-10 06:23:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 10:23:54 +0000 |
| commit | a1bc2aa05ef67eecce355f237b165567ef6e07e2 (patch) | |
| tree | fd31ba5fb13fd8d87c4c9c586c4617b759e50c2f /models/repo | |
| parent | d713cf6150a29c5bf4682642e3f620180814a3cb (diff) | |
| download | gitea-a1bc2aa05ef67eecce355f237b165567ef6e07e2.tar.gz gitea-a1bc2aa05ef67eecce355f237b165567ef6e07e2.zip | |
Avoid amending the Rebase and Fast-forward merge if there is no message template (#25779) (#25809)
Backport #25779 by @wxiaoguang
Related #22669. Close #25177
After the fix:
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models/repo')
| -rw-r--r-- | models/repo/git.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/repo/git.go b/models/repo/git.go index 7ae88058dc..c1af7ee960 100644 --- a/models/repo/git.go +++ b/models/repo/git.go @@ -11,7 +11,7 @@ type MergeStyle string const ( // MergeStyleMerge create merge commit MergeStyleMerge MergeStyle = "merge" - // MergeStyleRebase rebase before merging + // MergeStyleRebase rebase before merging, and fast-forward MergeStyleRebase MergeStyle = "rebase" // MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff) MergeStyleRebaseMerge MergeStyle = "rebase-merge" |