diff options
Diffstat (limited to 'custom/conf/app.example.ini')
| -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 ;; |