diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-07-10 16:12:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 10:12:50 +0200 |
| commit | d9872797f84f6a81bbed3d19fee536ce2a3aadb6 (patch) | |
| tree | 7fc1070a6233f0b8785176a963b56ced30bc7681 /models/repo | |
| parent | d2c3a90ee24f6e9e3ffff164fa7e675a269e5add (diff) | |
| download | gitea-d9872797f84f6a81bbed3d19fee536ce2a3aadb6.tar.gz gitea-d9872797f84f6a81bbed3d19fee536ce2a3aadb6.zip | |
Avoid amending the Rebase and Fast-forward merge if there is no message template (#25779)
Related #22669. Close #25177
After the fix:
Co-authored-by: Giteabot <teabot@gitea.io>
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" |