diff options
| author | Chris Copeland <chris@chrisnc.net> | 2024-02-12 14:37:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-12 23:37:23 +0100 |
| commit | 47b59658629f47e0ac559559a305b867740cae9c (patch) | |
| tree | 5bc0102a155565f1b813609082d9ae23712e0d65 /options | |
| parent | f9c3459831659d37fd885dd1a9db32dcf19420e4 (diff) | |
| download | gitea-47b59658629f47e0ac559559a305b867740cae9c.tar.gz gitea-47b59658629f47e0ac559559a305b867740cae9c.zip | |
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
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9af4d70171..96345f51f8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1775,6 +1775,7 @@ pulls.merge_pull_request = Create merge commit pulls.rebase_merge_pull_request = Rebase then fast-forward pulls.rebase_merge_commit_pull_request = Rebase then create merge commit pulls.squash_merge_pull_request = Create squash commit +pulls.fast_forward_only_merge_pull_request = Fast-forward only pulls.merge_manually = Manually merged pulls.merge_commit_id = The merge commit ID pulls.require_signed_wont_sign = The branch requires signed commits but this merge will not be signed |