The Trans Directory
change default strategy to be rebase
+3
-3
+1
-1
quartz.config.ts
+1
-1
quartz.config.ts
···
49
49
priority: ["frontmatter", "filesystem"], // you can add 'git' here for last modified from Git but this makes the build slower
50
50
}),
51
51
Plugin.SyntaxHighlighting(),
52
-
Plugin.ObsidianFlavoredMarkdown(),
52
+
Plugin.ObsidianFlavoredMarkdown({ enableInHtmlEmbed: false }),
53
53
Plugin.GitHubFlavoredMarkdown(),
54
54
Plugin.CrawlLinks({ markdownLinkResolution: "shortest" }),
55
55
Plugin.Latex({ renderEngine: "katex" }),
+2
-2
quartz/bootstrap-cli.mjs
+2
-2
quartz/bootstrap-cli.mjs
···
246
246
console.log(
247
247
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
248
248
)
249
-
spawnSync("git", ["pull", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
249
+
spawnSync("git", ["rebase", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
250
250
await popContentFolder(contentFolder)
251
251
console.log("Ensuring dependencies are up to date")
252
252
spawnSync("npm", ["i"], { stdio: "inherit" })
···
271
271
console.log(
272
272
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.",
273
273
)
274
-
spawnSync("git", ["pull", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
274
+
spawnSync("git", ["rebase", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
275
275
}
276
276
277
277
await popContentFolder(contentFolder)