git imrovements
Added lazygit and delta for nice output.
This commit is contained in:
parent
faaef993f8
commit
53cf519d4a
@ -29,6 +29,8 @@ brew "yt-dlp"
|
||||
brew "fnm"
|
||||
brew "go"
|
||||
brew "ctpv"
|
||||
brew "git-delta"
|
||||
brew "lazygit"
|
||||
|
||||
cask "alfred"
|
||||
cask "kitty"
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user