From a7e80f351a59965be37e307370dd06b01c21f54b Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhitoyokoi@nodered.jp>
Date: Mon, 21 Aug 2023 11:18:01 +0900
Subject: [PATCH] Fix git pull operation in project feature

---
 .../runtime/lib/storage/localfilesystem/projects/git/index.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
index 77b9ad2cd..96dab3417 100644
--- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
+++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -431,7 +431,7 @@ module.exports = {
         return runGitCommand(args,cwd);
     },
     pull: function(cwd,remote,branch,allowUnrelatedHistories,auth,gitUser) {
-        var args = ["pull"];
+        var args = ["pull", "--no-rebase"];
         if (remote && branch) {
             args.push(remote);
             args.push(branch);