Node-Red
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4290 from kazuhitoyokoi/dev-fixgitpull 

Fix git pull operation in project feature
pull/4297/head
Nick O'Leary 2023-08-21 15:42:11 +01:00 committed by GitHub
parent c39d3db121 a7e80f351a
commit 89b8e88df3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
},
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);