From d9d74be24eb6d8b19df23ead263220b3e0413dd5 Mon Sep 17 00:00:00 2001
From: buffet <dev@buffet.sh>
Date: Mon, 17 Jun 2024 11:09:06 +0200
Subject: [PATCH] Revert "feat: default to rebase instead of creating a merge
 commit"

This reverts commit ab0c9b87357d2255d0910db10ccf69aebbbf1dc2.
---
 hosts/ami/forgejo.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/hosts/ami/forgejo.nix b/hosts/ami/forgejo.nix
index 2fad10d..7b827dd 100644
--- a/hosts/ami/forgejo.nix
+++ b/hosts/ami/forgejo.nix
@@ -54,10 +54,6 @@ in {
           ENABLE_PUSH_CREATE_ORG = true;
         };
 
-        "repository.pull-request" = {
-          DEFAULT_MERGE_STYLE = "rebase";
-        };
-
         server = {
           DOMAIN = "buffets.kitchen";
           ROOT_URL = "https://buffets.kitchen/";
-- 
2.46.0