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;