frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix git pull operation in project feature

Browse Source
This commit is contained in:
Kazuhito Yokoi 2023-08-21 11:18:01 +09:00
parent c39d3db121
commit a7e80f351a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js vendored
View File

@ -431,7 +431,7 @@ module.exports = {
return runGitCommand(args,cwd); return runGitCommand(args,cwd);
}, },
pull: function(cwd,remote,branch,allowUnrelatedHistories,auth,gitUser) { pull: function(cwd,remote,branch,allowUnrelatedHistories,auth,gitUser) {
var args = ["pull"]; var args = ["pull", "--no-rebase"];
if (remote && branch) { if (remote && branch) {
args.push(remote); args.push(remote);
args.push(branch); args.push(branch);