keroosha/keroosha.cybergulag.today
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update npx quartz update script

Browse source
This commit is contained in:
Jacky Zhao 2023-08-09 09:10:40 -07:00
parent cea6834fef
commit ebf3263b7e
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
quartz/bootstrap-cli.mjs
View file

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