From c8c108c7f702ca3710733d6d455ca2661e13e8d3 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 1 Aug 2023 23:29:58 -0700 Subject: [PATCH] change default strategy to be rebase --- quartz.config.ts | 2 +- quartz/bootstrap-cli.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quartz.config.ts b/quartz.config.ts index 83b59e692..bd7abfb69 100644 --- a/quartz.config.ts +++ b/quartz.config.ts @@ -49,7 +49,7 @@ const config: QuartzConfig = { priority: ["frontmatter", "filesystem"], // you can add 'git' here for last modified from Git but this makes the build slower }), Plugin.SyntaxHighlighting(), - Plugin.ObsidianFlavoredMarkdown(), + Plugin.ObsidianFlavoredMarkdown({ enableInHtmlEmbed: false }), Plugin.GitHubFlavoredMarkdown(), Plugin.CrawlLinks({ markdownLinkResolution: "shortest" }), Plugin.Latex({ renderEngine: "katex" }), diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs index bc5df4e0d..75f646bd5 100755 --- a/quartz/bootstrap-cli.mjs +++ b/quartz/bootstrap-cli.mjs @@ -246,7 +246,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started. console.log( "Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.", ) - spawnSync("git", ["pull", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) + spawnSync("git", ["rebase", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) await popContentFolder(contentFolder) console.log("Ensuring dependencies are up to date") spawnSync("npm", ["i"], { stdio: "inherit" }) @@ -271,7 +271,7 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started. console.log( "Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.", ) - spawnSync("git", ["pull", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) + spawnSync("git", ["rebase", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" }) } await popContentFolder(contentFolder)