mirror of https://github.com/node-red/node-red.git
Fix git pull operation in project feature
This commit is contained in:
parent
c39d3db121
commit
a7e80f351a
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue