From 41d089f0dc9c7c2a97c00ccf173d23e616ef5b17 Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 15 May 2024 18:52:35 +0200 Subject: [PATCH] feat: DEFAULT_MERGE_STYLE fast-forward-only --- app.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.ini b/app.ini index e0c26b4..32f85a3 100644 --- a/app.ini +++ b/app.ini @@ -1041,7 +1041,7 @@ ENABLED = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;[repository.pull-request] +[repository.pull-request] ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -1055,7 +1055,7 @@ ENABLED = false ;REOPEN_KEYWORDS = reopen,reopens,reopened ;; ;; Set default merge style for repository creating, valid options: merge, rebase, rebase-merge, squash, fast-forward-only -;DEFAULT_MERGE_STYLE = merge +DEFAULT_MERGE_STYLE = fast-forward-only ;; ;; In the default merge message for squash commits include at most this many commits ;DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT = 50