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" }) } @@ -387,6 +387,7 @@ await serveHandler(req, res, { public: argv.output, directoryListing: false, trailingSlash: true, }) const status = res.statusCode const statusString =