From f580592b7edc753436df103dcd90564345666de5 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 24 Apr 2023 10:53:39 -0300
Subject: [PATCH] fix: tell git to merge

---
 .woodpecker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index b66844f..2fa1067 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -10,6 +10,7 @@ pipeline:
     - "echo \"[gitea.nulo.in]:420 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHgHIbf5/jkeyLMndnWlEO12DPj41YPqkmz+aIreVOsP\" >> ~/.ssh/known_hosts"
     - "eval $(ssh-agent -s)"
     - "echo \"$${SSH_KEY}\" | base64 -d | ssh-add -"
+    - "git config pull.rebase false"
     - "git config user.name Woodpecker"
     - "git config user.email ci@nulo.in"
     - "git remote add nulo ssh://_gitea@gitea.nulo.in:420/Sutty/gems.git"