diff options
| author | Chris Copeland <chris@chrisnc.net> | 2024-02-12 23:37:23 +0100 |
|---|---|---|
| committer | Gergely Nagy <forgejo@gergo.csillger.hu> | 2024-02-14 17:19:19 +0100 |
| commit | 83123b493f3ae25d07d81c86b1a78afe1c17db53 (patch) | |
| tree | 4b41976582fc5138983bc5b82752fd58ac57834d /custom/conf | |
| parent | Merge pull request 'Repository settings refactor' (#2221) from algernon/forge... (diff) | |
| download | forgejo-83123b493f3ae25d07d81c86b1a78afe1c17db53.tar.xz forgejo-83123b493f3ae25d07d81c86b1a78afe1c17db53.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 'custom/conf')
| -rw-r--r-- | custom/conf/app.example.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 6d7b3bedf6..1b53732b1b 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1061,7 +1061,7 @@ LEVEL = Info ;; List of keywords used in Pull Request comments to automatically reopen a related issue ;REOPEN_KEYWORDS = reopen,reopens,reopened ;; -;; Set default merge style for repository creating, valid options: merge, rebase, rebase-merge, squash +;; Set default merge style for repository creating, valid options: merge, rebase, rebase-merge, squash, fast-forward-only ;DEFAULT_MERGE_STYLE = merge ;; ;; In the default merge message for squash commits include at most this many commits |