Skip to content

Commit

Permalink
Adding diff-so-fancy
Browse files Browse the repository at this point in the history
  • Loading branch information
ijcd committed Sep 24, 2020
1 parent b397599 commit 451c56d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions local/boot/init.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ if ! zgen saved; then
zgen load caarlos0/zsh-pg
zgen load unixorn/git-extra-commands
zgen load MenkeTechnologies/zsh-more-completions
zgen load zdharma/zsh-diff-so-fancy

zgen load marzocchi/zsh-notify
zgen load MichaelAquilina/zsh-auto-notify
Expand Down
25 changes: 25 additions & 0 deletions modules/git/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
# Make `git rebase` safer on OS X
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
pager = diff-so-fancy | less --tabs=4 -RFX


#[color]
Expand Down Expand Up @@ -265,3 +266,27 @@
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f

#
# Added by diff-so-fancy
#
[color]
ui = true

[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22

[color "diff"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse

#
# End diff-so-fancy
#

0 comments on commit 451c56d

Please sign in to comment.