From c218f0fa08175ce7ea123320be8b4e2eb55d6437 Mon Sep 17 00:00:00 2001
From: Gitea Actions <actions@gitea.local>
Date: Sun, 23 Mar 2025 17:45:56 +0000
Subject: [PATCH] Merge main branch squashed 2025-03-23

---
 .gitea/workflows/update-flake.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index 0060667..788b3b0 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -34,7 +34,8 @@ jobs:
             if [ $commits_ahead -ne 0 ]
             then
               git fetch origin
-              git merge -m "Merge main branch $(date -I)" -X theirs origin/main
+              git merge -X theirs --squash origin/main
+              git commit -m "Merge main branch squashed $(date -I)"
             else
               echo "Merge not necessary"
             fi