diff --git a/machines/magenta/services/gitea.nix b/machines/magenta/services/gitea.nix
index 46bcdd8..767eaf8 100644
--- a/machines/magenta/services/gitea.nix
+++ b/machines/magenta/services/gitea.nix
@@ -69,6 +69,8 @@ in
       };
       "repository.pull-request" = {
         WORK_IN_PROGRESS_PREFIXES = "Draft:,[Draft]:,WIP:,[WIP]:";
+        DEFAULT_MERGE_STYLE = "rebase";
+        POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES = true;
       };
       indexer = {
         ISSUE_INDEXER_PATH = "${giteaCfg.stateDir}/indexers/issues.bleve";