From c01ec828e2506c62fb0a25aca01eaaf83098d0db Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Thu, 30 Sep 2021 19:14:40 +0800
Subject: [PATCH] =?UTF-8?q?ql=20update=E6=B7=BB=E5=8A=A0patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shell/update.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/update.sh b/shell/update.sh
index f69d9a31..22cc03fd 100755
--- a/shell/update.sh
+++ b/shell/update.sh
@@ -308,6 +308,8 @@ patch_version() {
     if ! type ts-node >/dev/null 2>&1; then
         pnpm i -g ts-node typescript tslib
     fi
+
+    git config --global pull.rebase false
 }
 
 reload_pm2() {