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 --- Makefile | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 50edc2d..9beee0f 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,12 @@ @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 + @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 -- Gitblit v1.10.0