Merge main branch squashed 2025-03-23

2025-03-23 17:45:56 +00:00 · 2025-03-23 17:45:56 +00:00 · c218f0fa08
commit c218f0fa08
parent e2fa915bdd
1 changed files with 2 additions and 1 deletions
--- 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