added git config options, support for delta and difftastic.
This commit is contained in:
		
							parent
							
								
									6038e14686
								
							
						
					
					
						commit
						0c76c89fab
					
				
					 2 changed files with 29 additions and 1 deletions
				
			
		| 
						 | 
					@ -104,6 +104,9 @@ uses yazi as a file explorer
 | 
				
			||||||
### Yazi
 | 
					### Yazi
 | 
				
			||||||
for accurate mimetype info, I suggest installing `perl-file-mimeinfo`
 | 
					for accurate mimetype info, I suggest installing `perl-file-mimeinfo`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Git
 | 
				
			||||||
 | 
					For diff tools, install `git-delta` and `difftastic`. I also reccomend installing `lazygit` and/or `tig`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Khal and Khard:
 | 
					### Khal and Khard:
 | 
				
			||||||
both require the vdirsyncer program and config.
 | 
					both require the vdirsyncer program and config.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,13 +4,38 @@
 | 
				
			||||||
[alias]
 | 
					[alias]
 | 
				
			||||||
	hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
 | 
						hist = log --graph --date-order --date=short --pretty=format:'%C(auto)%h%d %C(reset)%s %C(bold blue)%ce %C(reset)%C(green)%cr (%cd)'
 | 
				
			||||||
	graph = log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'
 | 
						graph = log --graph --topo-order --all --pretty=format:'%C(auto)%h %C(cyan)%an %C(blue)%ar %C(auto)%d %s'
 | 
				
			||||||
 | 
					    recent = branch --sort=-committerdate --format='%(committerdate:relative)%09%(refname:short)'
 | 
				
			||||||
[init]
 | 
					[init]
 | 
				
			||||||
	defaultBranch = main
 | 
						defaultBranch = main
 | 
				
			||||||
[push]
 | 
					[push]
 | 
				
			||||||
	autoSetupRemote = true
 | 
						autoSetupRemote = true
 | 
				
			||||||
 | 
						default = current
 | 
				
			||||||
[difftool]
 | 
					[difftool]
 | 
				
			||||||
	prompt = false
 | 
						prompt = false
 | 
				
			||||||
[diff]
 | 
					[diff]
 | 
				
			||||||
    tool = nvimdiff
 | 
					    ; tool = nvimdiff
 | 
				
			||||||
 | 
					    tool = difftastic
 | 
				
			||||||
 | 
						algorithm = histogram
 | 
				
			||||||
 | 
						submodule = log
 | 
				
			||||||
[difftool "nvimdiff"]
 | 
					[difftool "nvimdiff"]
 | 
				
			||||||
    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 | 
					    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 | 
				
			||||||
 | 
					[difftool "difftastic"]
 | 
				
			||||||
 | 
					    cmd = difft "$LOCAL" "$REMOTE"
 | 
				
			||||||
 | 
					[pager]
 | 
				
			||||||
 | 
					    difftool=true
 | 
				
			||||||
 | 
					[pull]
 | 
				
			||||||
 | 
						ff = true
 | 
				
			||||||
 | 
					[merge]
 | 
				
			||||||
 | 
						conflictstyle = zdiff3
 | 
				
			||||||
 | 
					[rebase]
 | 
				
			||||||
 | 
						autoSquash = true
 | 
				
			||||||
 | 
					[help]
 | 
				
			||||||
 | 
						autocorrect = prompt
 | 
				
			||||||
 | 
					[core]
 | 
				
			||||||
 | 
						pager = delta
 | 
				
			||||||
 | 
					[delta]
 | 
				
			||||||
 | 
					    side-by-side = true
 | 
				
			||||||
 | 
					[branch]
 | 
				
			||||||
 | 
						sort = -committerdate
 | 
				
			||||||
 | 
					[status]
 | 
				
			||||||
 | 
						submodulesummary = true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue