From ab0c9b87357d2255d0910db10ccf69aebbbf1dc2 Mon Sep 17 00:00:00 2001 From: buffet Date: Mon, 3 Jun 2024 09:12:25 +0200 Subject: [PATCH] feat: default to rebase instead of creating a merge commit --- hosts/ami/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/ami/forgejo.nix b/hosts/ami/forgejo.nix index 5ffcf95..eeba937 100644 --- a/hosts/ami/forgejo.nix +++ b/hosts/ami/forgejo.nix @@ -54,6 +54,10 @@ in { ENABLE_PUSH_CREATE_ORG = true; }; + "repository.pull-request" = { + DEFAULT_MERGE_STYLE = "rebase"; + }; + server = { DOMAIN = "buffets.kitchen"; ROOT_URL = "https://buffets.kitchen/";