update npx quartz update script

2023-08-09 09:10:40 -07:00
parent 1b37945b13
commit 3918ad7a75
3 changed files with 23 additions and 3 deletions
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@ -129,7 +129,7 @@ async function popContentFolder(contentFolder) {
 }

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