scapegoat/Docs2.git

summary
reflog
commits
tree
docs
forks
compare

Jacky Zhao

2023-08-12 c55d54f068a102d85dc16c5c0e63db413bc56145

 quartz/bootstrap-cli.mjs

@@ -129,7 +129,7 @@
}

function gitPull(origin, branch) {
  const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
  const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
  spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
}

			@@ -129,7 +129,7 @@
			}

			function gitPull(origin, branch) {
			const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
			const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"]
			spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
			}