From 84c75d05460dd2974ff04a43f6a770fc31deca63 Mon Sep 17 00:00:00 2001
From: DhammaCharts <100090806+DhammaCharts@users.noreply.github.com>
Date: Mon, 06 Jun 2022 11:56:47 +0000
Subject: [PATCH] Merge branch 'hugo' into hugo

---
 content/notes/setup.md |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/content/notes/setup.md b/content/notes/setup.md
index 0a008b1..495a43b 100644
--- a/content/notes/setup.md
+++ b/content/notes/setup.md
@@ -31,11 +31,21 @@
 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?
+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 `assets/styles/custom.scss`, the files in `data/`, or anything inside `layouts/`, your customization may be overwritten!
+> 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
@@ -44,5 +54,5 @@
 
 # index and fetch changes
 git fetch upstream
-git checkout upstream/hugo -- layouts .github Makefile assets config.toml data static
+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