From c022194e4accd1da27227c1d117fdea1ab0b533a Mon Sep 17 00:00:00 2001
From: ctrlcvs <1509167646@qq.com>
Date: Wed, 7 Jun 2023 19:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8F=92=E4=BB=B6=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E6=9B=B4=E6=96=B0=EF=BC=8C=E9=81=BF=E5=85=8D=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=A2=AB=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E6=9B=B4=E6=94=B9=E5=9B=9E=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/other/update.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/other/update.js b/plugins/other/update.js
index 5765dea..93fb161 100644
--- a/plugins/other/update.js
+++ b/plugins/other/update.js
@@ -108,7 +108,9 @@ export class update extends plugin {
     }
 
     if (plugin) {
-      cm = `git -C ./plugins/${plugin}/ fetch --all && git -C ./plugins/${plugin}/ reset --hard && git -C ./plugins/${plugin}/ pull`
+      cm = `git -C ./plugins/${plugin}/ pull --no-rebase`
+      // 请带上脑子来水pr
+      // cm = `git -C ./plugins/${plugin}/ fetch --all && git -C ./plugins/${plugin}/ reset --hard && git -C ./plugins/${plugin}/ pull`
     }
 
     this.oldCommitId = await this.getcommitId(plugin)