aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2024-01-10 07:52:56 -0500
committerGitHub <noreply@github.com>2024-01-10 07:52:56 -0500
commit32e8b9f84c1a33307fcc15537a44ac4bf46a073b (patch)
tree4165b70780386d69a950389e8bf86f03fb873332
parent740d92b42960b3084b381b0c049cae90af9396ae (diff)
parent77a2fa85e146ccb130c46f14b31ee0da6247da15 (diff)
downloadx-32e8b9f84c1a33307fcc15537a44ac4bf46a073b.tar.xz
x-32e8b9f84c1a33307fcc15537a44ac4bf46a073b.zip
Merge branch 'master' into dependabot/go_modules/tailscale.com-1.56.1
-rw-r--r--.github/workflows/dependabot.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
index c2539f6..379ed6e 100644
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -33,6 +33,6 @@ jobs:
commit_user_email: mimi@xeserv.us
commit_author: Mimi <mimi@xeserv.us>
- name: Enable Pull Request Automerge
- run: gh pr merge --merge --auto ${{ github.event.number }}
+ run: gh pr merge --squash --auto ${{ github.event.number }}
env:
GH_TOKEN: ${{ github.token }}