From 3f667388f14258ad3abf9ac8921c55cb3a2e8a01 Mon Sep 17 00:00:00 2001
From: Conventional Changelog Action <conventional.changelog.action@github.com>
Date: Sat, 16 Jan 2021 11:46:23 +0000
Subject: [PATCH] chore(release): v1.0.22

---
 CHANGELOG.md | 14 +++++++-------
 index.js     |  3 ++-
 package.json |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed6ff8c..f16801b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
+## <small>1.0.22 (2021-01-16)</small>
+
+* fix: git pull strategy ([edb4a38](https://github.com/simonecorsi/mawesome/commit/edb4a38))
+
+
+
 ## <small>1.0.21 (2021-01-16)</small>
 
+* chore(release): v1.0.21 ([3c3ab0a](https://github.com/simonecorsi/mawesome/commit/3c3ab0a))
 * fix: added latest tag at release ([6b8b525](https://github.com/simonecorsi/mawesome/commit/6b8b525))
 
 
@@ -25,10 +32,3 @@
 
 
 
-## <small>1.0.17 (2021-01-16)</small>
-
-* chore(release): v1.0.17 ([380a0ec](https://github.com/simonecorsi/mawesome/commit/380a0ec))
-* fix: exit condition ([914a115](https://github.com/simonecorsi/mawesome/commit/914a115))
-
-
-
diff --git a/index.js b/index.js
index 7a25348..0bf2187 100644
--- a/index.js
+++ b/index.js
@@ -21289,7 +21289,7 @@ exports.default = new (class Git {
         this.add = (file) => this.exec(`add ${file}`);
         this.commit = (message) => this.exec(`commit -m "${message}"`);
         this.pull = () => __awaiter(this, void 0, void 0, function* () {
-            const args = ['pull'];
+            const args = ['pull', 'origin', branch];
             // Check if the repo is unshallow
             if (yield this.isShallow()) {
                 args.push('--unshallow');
@@ -21310,6 +21310,7 @@ exports.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(`https://x-access-token:${githubToken}@github.com/${GITHUB_REPOSITORY}.git`);
     }
diff --git a/package.json b/package.json
index b38fa68..e8240ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mawesome",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "",
   "main": "index.js",
   "scripts": {