From f15aa0032a4a7d8b2bae2d237cfc9fe90dc1d99d Mon Sep 17 00:00:00 2001 From: saberzero1 Date: Wed, 27 May 2026 20:43:56 +0200 Subject: [PATCH] fix: allow updating when repository is generated from template --- quartz/cli/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quartz/cli/helpers.js b/quartz/cli/helpers.js index 7339e24..75334c7 100644 --- a/quartz/cli/helpers.js +++ b/quartz/cli/helpers.js @@ -34,7 +34,7 @@ export async function stashContentFolder(contentFolder) { } export function gitPull(origin, branch) { - const flags = ["--no-rebase", "--autostash", "--no-edit"] + const flags = ["--no-rebase", "--autostash", "--no-edit", "--allow-unrelated-histories"] const out = spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" }) if (out.stderr) { throw new Error(styleText("red", `Error while pulling updates: ${out.stderr}`))