From 736c3981c4affff8dea1eb908ff760ee740ec4a3 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 12 Aug 2023 06:25:44 +0000
Subject: [PATCH] fix emit filepaths, tag emit being overriden by content
---
quartz/bootstrap-cli.mjs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 71d6957..d00a242 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -84,6 +84,10 @@
default: false,
describe: "show detailed bundle information",
},
+ concurrency: {
+ number: true,
+ describe: "how many threads to use to parse notes",
+ },
}
function escapePath(fp) {
@@ -125,7 +129,7 @@
}
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" })
}
--
Gitblit v1.10.0