From 9b72edcd9cce10d6064e4e8b2f61b7db2966515d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 25 Oct 2022 20:14:13 +0000
Subject: [PATCH] Merge branch 'hugo' of https://github.com/jackyzha0/quartz into hugo
---
Makefile | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 50edc2d..5a88927 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,17 @@
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
update: ## Update Quartz to the latest version on Github
+ go install github.com/jackyzha0/hugo-obsidian@latest
@git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git)
git fetch upstream
git log --oneline --decorate --graph ..upstream/hugo
- git checkout -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data
+ git checkout -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data
+
+update-force: ## Forcefully pull all changes and don't ask to patch
+ go install github.com/jackyzha0/hugo-obsidian@latest
+ @git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git)
+ git fetch upstream
+ git checkout upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data
serve: ## Serve Quartz locally
- hugo-obsidian -input=content -output=assets/indices -index -root=. && hugo server --enableGitInfo
+ hugo-obsidian -input=content -output=assets/indices -index -root=. && hugo server --enableGitInfo --minify
--
Gitblit v1.10.0