yannic/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup diff configuration and improve colors

Browse source
This commit is contained in:
Yax 2023-08-22 14:44:49 +02:00
parent 0d579d975f
commit 1310814808
1 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dot_gitconfig.tmpl
View file

@ -1,10 +1,13 @@
[user] [user]
email = {{ .git_email }} email = {{ .git_email }}
name = {{ .git_alias }} name = {{ .git_alias }}
[pull] [pull]
rebase = false rebase = false
[push] [push]
default = current default = current
[alias] [alias]
a = add a = add
ahead-of-master = log --oneline origin/master..HEAD ahead-of-master = log --oneline origin/master..HEAD
@ -37,18 +40,35 @@
untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done" untrack = "!for BRANCH in $(git branch | grep -v '*'); do git branch -D \"${BRANCH}\"; done"
work-in-progress = rebase -i @{u} work-in-progress = rebase -i @{u}
sync = "!git untrack && git gc && git f && git track" sync = "!git untrack && git gc && git f && git track"
[include] [include]
path = ~/.gitconfig_custom.inc path = ~/.gitconfig_custom.inc
[credential] [credential]
helper = store helper = store
[credential "https://github.com"] [credential "https://github.com"]
helper = cache helper = cache
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
[merge]
tool = meld
[core] [core]
pager = diff-so-fancy | less --tabs=4 -RFX pager = diff-so-fancy | less --tabs=4 -RFX
[interactive] [interactive]
diffFilter = diff-so-fancy --patch diffFilter = diff-so-fancy --patch
[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
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse