From 1475172bdb223e2f889e7a78450284bd790f7c01 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 30 Jul 2023 10:17:52 -0400
Subject: [PATCH] switch to rebase merge

uses fast-forward commit style
---
 .github/workflows/update.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index ab28c54..b41f0a0 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Check the Flake
         run: nix flake check
       - name: Enable Pull Request Automerge
-        run: gh pr merge --merge --auto ${{ steps.update.outputs.pull-request-number }}
+        run: gh pr merge --rebase --auto ${{ steps.update.outputs.pull-request-number }}
         env:
           GH_TOKEN: ${{ github.token }}