From f7027e7ecd26abe2a99ea1bb280808a4294bb4f2 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 20 Apr 2022 16:20:21 +0000
Subject: [PATCH] Merge pull request #108 from exu3/patch-1

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

diff --git a/content/notes/setup.md b/content/notes/setup.md
index ea417df..495a43b 100644
--- a/content/notes/setup.md
+++ b/content/notes/setup.md
@@ -31,7 +31,22 @@
 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 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
@@ -39,5 +54,5 @@
 
 # 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 -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data 
+```

--
Gitblit v1.10.0