diff options
| author | ttys3 <41882455+ttys3@users.noreply.github.com> | 2022-06-03 11:45:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 23:45:54 -0400 |
| commit | 0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209 (patch) | |
| tree | 54ceb9a1bf1e750188f8cce9380e0f6a7898217e /custom | |
| parent | 808a7803098bd86c83185cb823c5b0e2a5b2c56d (diff) | |
| download | gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.tar.gz gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.zip | |
feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section for repo init (#19751)
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/conf/app.example.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 03bdf45350..9a50564769 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -948,6 +948,9 @@ PATH = ;; 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 +;DEFAULT_MERGE_STYLE = merge +;; ;; In the default merge message for squash commits include at most this many commits ;DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT = 50 ;; |