From e0fd9570d746cb2aa270dbe64dae038fc02bdbac Mon Sep 17 00:00:00 2001 From: Aiden Bai <aiden.bai05@gmail.com> Date: Fri, 27 May 2022 16:49:28 +0000 Subject: [PATCH] Bump million to 1.9.4 --- content/notes/setup.md | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/content/notes/setup.md b/content/notes/setup.md index 2cd463d..495a43b 100644 --- a/content/notes/setup.md +++ b/content/notes/setup.md @@ -1,5 +1,7 @@ --- title: "Setup" +tags: +- setup --- ## Making your own Quartz @@ -26,4 +28,31 @@ ✏️ [Editing Notes in Quartz](notes/editing.md) -Having problems? Checkout our [FAQ and Troubleshooting guide](notes/troubleshooting.md). \ No newline at end of file +Having problems? Checkout our [FAQ and Troubleshooting guide](notes/troubleshooting.md). + +## Updating +Haven't updated Quartz in a while and want all the cool new optimizations? On Unix/Mac systems you can run the following command for a one-line update! This command will show you a log summary of all commits since you last updated, press `q` to acknowledge this. Then, it will show you each change in turn and press `y` to accept the patch or `n` to reject it. Usually you should press `y` for most of these unless it conflicts with existing changes you've made! + +```shell +make update + +# or, if you don't want the interactive parts and just want the update +make update-force +``` + +Or, manually checkout the changes yourself. + +> ⚠️ **WARNING** ⚠️ +> +> If you customized the files in `data/`, or anything inside `layouts/`, your customization may be overwritten! +> Make sure you have a copy of these changes if you don't want to lose them. + + +```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 -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data +``` -- Gitblit v1.10.0