Skip to content

Commit

Permalink
feat(git): use delta instead of diff-so-fancy
Browse files Browse the repository at this point in the history
  • Loading branch information
tagoro9 committed Apr 26, 2021
1 parent 3820181 commit 64d0175
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Brewfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
brew "awscli"
brew "bat"
brew "cli53"
brew "diff-so-fancy"
brew "fd"
brew "fzf"
brew "git-delta"
brew "gh"
brew "gnupg"
brew "htop"
Expand Down
19 changes: 11 additions & 8 deletions config/git/gitconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@

[core]
excludesfile = /Users/victor/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
pager = delta
[user]
name = Victor
email = victor@turo.com
Expand Down Expand Up @@ -133,7 +131,6 @@
update-submodules = submodule update --init --recursive
[merge]
conflictstyle = diff3
tool = p4mergetool
[rerere]
enabled = 1
[push]
Expand All @@ -143,9 +140,6 @@
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[mergetool]
keepBackup = false
[rebase]
Expand All @@ -156,3 +150,12 @@
gpgsign = true
[tag]
forceSignAnnotated = true
[interactive]
diffFilter = delta --color-only
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none

0 comments on commit 64d0175

Please sign in to comment.