tomoyanonymous/quartz-research-note
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pull strategy

Browse Source
This commit is contained in:
Jacky Zhao 2023-08-03 22:29:46 -07:00
parent 2b5dc84c41
commit 0a83b89a33
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/features/callouts.md
View File

@ -50,10 +50,6 @@ title: Callouts
> >
> Aliases: failure, fail, missing > Aliases: failure, fail, missing
> [!fail] Failure
>
> Aliases: failure, fail, missing
> [!danger] Error > [!danger] Error
> >
> Aliases: danger, error > Aliases: danger, error

6
quartz/bootstrap-cli.mjs
View File

@ -121,10 +121,8 @@ async function popContentFolder(contentFolder) {
} }
function gitPull(origin, branch) { function gitPull(origin, branch) {
spawnSync("git", ["fetch", origin, branch], { stdio: "inherit" }) const flags = ["-s", "recursive", "-X", "ours"]
spawnSync("git", ["checkout", `${origin}/${branch}`, "--", ":(exclude)content"], { spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
stdio: "inherit",
}).error
} }
yargs(hideBin(process.argv)) yargs(hideBin(process.argv))