From 2f7d53b4b91b492c0fdc0e8f5e09e06ebab8887d Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sun, 23 Mar 2025 18:45:12 +0100
Subject: [PATCH] workflow: do not use squashed merging

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

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