From 1c1b2e516e4bd22e42d340664b6c05fcf0eb9edc Mon Sep 17 00:00:00 2001 From: buffet Date: Sun, 29 Sep 2024 15:49:11 +0200 Subject: [PATCH] feat(forgejo): default to rebase instead of merge This is kinda what I ended up doing anyways. Kepes me from doing bad commit history, hopefully. Signed-off-by: buffet --- hosts/ami/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/ami/forgejo.nix b/hosts/ami/forgejo.nix index 3bbb086..b2295fc 100644 --- a/hosts/ami/forgejo.nix +++ b/hosts/ami/forgejo.nix @@ -61,6 +61,10 @@ in { LANDING_PAGE = "/kitchen"; }; + "repository.pull-request" = { + DEFAULT_MERGE_STYLE = "rebase"; + }; + service = { DISABLE_REGISTRATION = true; ENABLE_NOTIFY_MAIL = true;