docs: make update command and clarify update steps/potential danger
This commit is contained in:
		
							parent
							
								
									9509a64354
								
							
						
					
					
						commit
						a7abc6ab96
					
				
					 2 changed files with 19 additions and 4 deletions
				
			
		
							
								
								
									
										7
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -7,7 +7,12 @@ update: ## Update Quartz to the latest version on Github
 | 
			
		|||
	@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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue