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.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
check_test.go	Replace assert.Fail with assert.FailNow (#27578)	2023-10-11 11:02:24 +00:00
comment.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
commit_status.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
edits.go
lfs.go	Remove GetByBean method because sometimes it's danger when query condition parameter is zero and also introduce new generic methods (#28220)	2023-12-07 15:27:36 +08:00
main_test.go	make writing main test easier (#27270)	2023-09-28 01:38:53 +00:00
merge.go	Add merge style fast-forward-only (#28954)	2024-02-12 23:37:23 +01:00
merge_ff_only.go	Add merge style fast-forward-only (#28954)	2024-02-12 23:37:23 +01:00
merge_merge.go	Add merge style fast-forward-only (#28954)	2024-02-12 23:37:23 +01:00
merge_prepare.go	Refactor merge/update git command calls (#23366)	2023-03-09 09:48:52 -06:00
merge_rebase.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
merge_squash.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
merge_test.go	Support template for merge message description (#22248)	2022-12-29 14:40:20 +02:00
patch.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
patch_unmerged.go
pull.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
pull_test.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
review.go	Simplify how git repositories are opened (#28937)	2024-01-27 21:09:51 +01:00
temp_repo.go	Adjust object format interface (#28469)	2023-12-17 11:56:08 +00:00
update.go	Sync branches into databases (#22743)	2023-06-29 10:03:20 +00:00
update_rebase.go	Refactor and tidy-up the merge/update branch code (#22568)	2023-03-07 15:07:35 -05:00