0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-14 05:24:03 +01:00
gitea/services/pull
Chris Copeland 47b5965862
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
2024-02-12 23:37:23 +01:00
..
check_test.go
check.go
comment.go
commit_status.go
edits.go
lfs.go
main_test.go
merge_ff_only.go
merge_merge.go
merge_prepare.go
merge_rebase.go
merge_squash.go
merge_test.go
merge.go
patch_unmerged.go
patch.go
pull_test.go
pull.go
review.go
temp_repo.go
update_rebase.go
update.go