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

Merge pull request #4290 from kazuhitoyokoi/dev-fixgitpull

Browse Source 
Fix git pull operation in project feature
This commit is contained in:
Nick O'Leary 2023-08-21 15:42:11 +01:00 committed by GitHub
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); 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);