From 8c41e3b8df91c9a71bc951443bcdf8d402f403c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Sat, 28 Mar 2026 13:57:22 -0600
Subject: [PATCH] feat(gitea): set default merge style

---
 modules/nixos/deertopia/gitea.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/nixos/deertopia/gitea.nix b/modules/nixos/deertopia/gitea.nix
index adecafc..0b5073a 100644
--- a/modules/nixos/deertopia/gitea.nix
+++ b/modules/nixos/deertopia/gitea.nix
@@ -94,6 +94,7 @@ in {
             # ko
             "공사 중:" "공사중:" "중:" "[중]" "中:" "[中]"
           ];
+          DEFAULT_MERGE_STYLE = "rebase";
         };
         mailer = {
           ENABLED = true;