git imrovements

Added lazygit and delta for nice output.
This commit is contained in:
Tony Miller 2025-10-09 12:26:39 +10:00
parent faaef993f8
commit 53cf519d4a
3 changed files with 15 additions and 0 deletions

View File

@ -29,6 +29,8 @@ brew "yt-dlp"
brew "fnm"
brew "go"
brew "ctpv"
brew "git-delta"
brew "lazygit"
cask "alfred"
cask "kitty"

View File

@ -9,6 +9,15 @@
[core]
excludesFile = ~/.config/git/ignore
quotepath = false
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
naviate = true
side-by-side = true
line-number = true
[pull]
rebase = true
@ -31,6 +40,9 @@
prompt = false
trustExitCode = true
[merge]
conflictStyle = zdiff3
[mergetool]
prompt = false
conflictstyle = diff3

1
.zshrc
View File

@ -123,6 +123,7 @@ alias vimdiff="nvim -d"
alias bb="bbedit"
alias bw="bbedit --wait --resume"
alias ls="eza --group-directories-first --header"
alias lg="lazygit"
alias rm=trash