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 "fnm"
|
||||||
brew "go"
|
brew "go"
|
||||||
brew "ctpv"
|
brew "ctpv"
|
||||||
|
brew "git-delta"
|
||||||
|
brew "lazygit"
|
||||||
|
|
||||||
cask "alfred"
|
cask "alfred"
|
||||||
cask "kitty"
|
cask "kitty"
|
||||||
|
|||||||
@ -9,6 +9,15 @@
|
|||||||
[core]
|
[core]
|
||||||
excludesFile = ~/.config/git/ignore
|
excludesFile = ~/.config/git/ignore
|
||||||
quotepath = false
|
quotepath = false
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
naviate = true
|
||||||
|
side-by-side = true
|
||||||
|
line-number = true
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
@ -31,6 +40,9 @@
|
|||||||
prompt = false
|
prompt = false
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictStyle = zdiff3
|
||||||
|
|
||||||
[mergetool]
|
[mergetool]
|
||||||
prompt = false
|
prompt = false
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
|||||||
1
.zshrc
1
.zshrc
@ -123,6 +123,7 @@ alias vimdiff="nvim -d"
|
|||||||
alias bb="bbedit"
|
alias bb="bbedit"
|
||||||
alias bw="bbedit --wait --resume"
|
alias bw="bbedit --wait --resume"
|
||||||
alias ls="eza --group-directories-first --header"
|
alias ls="eza --group-directories-first --header"
|
||||||
|
alias lg="lazygit"
|
||||||
|
|
||||||
alias rm=trash
|
alias rm=trash
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user