From edb4a38f6b0beb9983ff90bb3e8f57975d393c16 Mon Sep 17 00:00:00 2001
From: Simone Corsi <simonecorsi.rm@gmail.com>
Date: Sat, 16 Jan 2021 12:45:29 +0100
Subject: [PATCH] fix: git pull strategy

---
 src/git.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/git.ts b/src/git.ts
index 43de869..d9a0440 100644
--- a/src/git.ts
+++ b/src/git.ts
@@ -15,6 +15,7 @@ export default new (class Git {
     // Set config
     this.config('user.name', 'GitHub Actions');
     this.config('user.email', 'actions@users.noreply.github.com');
+    this.config('pull.rebase', 'false');
 
     // Update the origin
     this.updateOrigin(
@@ -53,7 +54,7 @@ export default new (class Git {
   commit = (message: string) => this.exec(`commit -m "${message}"`);
 
   pull = async () => {
-    const args = ['pull'];
+    const args = ['pull', 'origin', branch];
 
     // Check if the repo is unshallow
     if (await this.isShallow()) {