scapegoat/Docs2.git

summary
reflog
commits
tree
docs
forks
compare

Jacky Zhao

2023-08-11 21cc6a5da9edefd199c0b2158b85b8cd10dd901c

 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" })
			}