You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
12 months ago
..
check.go Simplify how git repositories are opened (#28937) 1 year ago
check_test.go Replace assert.Fail with assert.FailNow (#27578) 1 year ago
comment.go Simplify how git repositories are opened (#28937) 1 year ago
commit_status.go Simplify how git repositories are opened (#28937) 1 year ago
edits.go Implement FSFE REUSE for golang files (#21840) 2 years ago
lfs.go Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220) 1 year ago
main_test.go make writing main test easier (#27270) 1 year ago
merge.go Add merge style `fast-forward-only` (#28954) 12 months ago
merge_ff_only.go Add merge style `fast-forward-only` (#28954) 12 months ago
merge_merge.go Add merge style `fast-forward-only` (#28954) 12 months ago
merge_prepare.go Refactor merge/update git command calls (#23366) 2 years ago
merge_rebase.go Simplify how git repositories are opened (#28937) 1 year ago
merge_squash.go Simplify how git repositories are opened (#28937) 1 year ago
merge_test.go Support template for merge message description (#22248) 2 years ago
patch.go Simplify how git repositories are opened (#28937) 1 year ago
patch_unmerged.go Implement FSFE REUSE for golang files (#21840) 2 years ago
pull.go Simplify how git repositories are opened (#28937) 1 year ago
pull_test.go Simplify how git repositories are opened (#28937) 1 year ago
review.go Simplify how git repositories are opened (#28937) 1 year ago
temp_repo.go Adjust object format interface (#28469) 1 year ago
update.go Sync branches into databases (#22743) 2 years ago
update_rebase.go Refactor and tidy-up the merge/update branch code (#22568) 2 years ago