tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

feat: add DEFAULT_MERGE_STYLE to repository.pull-request section for repo init (#19751)

Browse Source
This commit is contained in:
ttys3
2022-06-03 11:45:54 +08:00
committed by GitHub
parent 808a780309
commit 0c759fd4de
6 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
custom/conf/app.example.ini
View File

@@ -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
;;