1
0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00

git/config: improve git-diff colours with diff-so-fancy

This commit is contained in:
2018-03-29 15:57:51 +01:00
parent f288397231
commit 593f39fff3
4 changed files with 32 additions and 15 deletions

View File

@ -4,7 +4,8 @@
signingkey = CFBB6A86
[core]
autocrlf = input
excludesfile = /home/frebib/.config/git/gitignore
excludesfile = $HOME/.config/git/gitignore
pager = diff-so-fancy | less
[commit]
gpgsign = true
[push]
@ -13,8 +14,6 @@
rebase = true
[rebase]
autoStash = true
[color]
ui = auto
[log]
date = relative
[format]
@ -27,8 +26,6 @@
[advice]
statusHints = false
pushUpdateRejected = false
[diff]
algorithm = patience
[sendemail]
from = Joe Groocock <me@frebib.net>
smtpserver = smtp.zoho.com
@ -36,3 +33,25 @@
smtpencryption = ssl
smtpserverport = 465
suppresscc = self
[diff]
algorithm = patience
[interactive]
diffFilter = diff-so-fancy --patch-mode
[color]
ui = true
[color "diff"]
meta = cyan
frag = magenta
commit = yellow
old = red
new = green
whitespace = red 88 reverse
[color "diff-highlight"]
oldNormal = red
oldHighlight = red 88
newNormal = green
newHighlight = green 22
[diff-so-fancy]
changeHunkIndicators = false
# vim: noet

View File

@ -22,7 +22,7 @@ highlight = #5294E2
# Normal colours
color0 = #333638
color1 = #ff3f00
color1 = #f41f1c
color2 = #8bc34a
color3 = #ffc107
color4 = #0266f4
@ -32,7 +32,7 @@ color7 = #8b9396
# Bright colours
color8 = #475760
color9 = #ef5345
color9 = #e53727
color10 = #9ccc65
color11 = #ffa000
color12 = #81b3f9