From f6933be7dc82119d4346b3fe2184fc9bc87e549b Mon Sep 17 00:00:00 2001 From: sameu Date: Wed, 7 Jun 2023 04:52:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=96=B0=20(#168)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/other/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/other/update.js b/plugins/other/update.js index c08794f..5765dea 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -108,7 +108,7 @@ export class update extends plugin { } if (plugin) { - cm = `git -C ./plugins/${plugin}/ pull --no-rebase` + cm = `git -C ./plugins/${plugin}/ fetch --all && git -C ./plugins/${plugin}/ reset --hard && git -C ./plugins/${plugin}/ pull` } this.oldCommitId = await this.getcommitId(plugin)