From 9509a64354f40981ec0efccb7dda0c1c5da2c190 Mon Sep 17 00:00:00 2001 From: Jacky Zhao <j.zhao2k19@gmail.com> Date: Tue, 05 Apr 2022 07:02:48 +0000 Subject: [PATCH] Merge branch 'hugo' of https://github.com/jackyzha0/quartz into hugo --- content/notes/setup.md | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/content/notes/setup.md b/content/notes/setup.md index ea417df..0a008b1 100644 --- a/content/notes/setup.md +++ b/content/notes/setup.md @@ -33,11 +33,16 @@ ## Updating Haven't updated Quartz in a while and want all the cool new optimizations? +> ⚠️ **WARNING** ⚠️ +> +> if you customized `assets/styles/custom.scss`, the files in `data/`, or anything inside `layouts/`, your customization may be overwritten! + + ```shell # add Quartz as a remote host git remote add upstream git@github.com:jackyzha0/quartz.git # index and fetch changes git fetch upstream -git checkout upstream/hugo -- layouts .github Makefile assets config.toml data layouts static -``` \ No newline at end of file +git checkout upstream/hugo -- layouts .github Makefile assets config.toml data static +``` -- Gitblit v1.10.0