Add delta as git diff tool

This commit is contained in:
Daniel Lynn 2022-05-31 10:37:33 -05:00
parent f2f8e69d3a
commit c42390c48e
Signed by: daniel
GPG Key ID: 28496A140E180A9D

View File

@ -1,10 +1,13 @@
[init] [init]
defaultBranch = main defaultBranch = main
templatedir = ~/.git_template templatedir = ~/.git_template
[push] [push]
default = current default = current
[color] [color]
ui = auto ui = auto
[alias] [alias]
aa = add --all aa = add --all
ap = add --patch ap = add --patch
@ -19,21 +22,45 @@
cleanup = "!git branch --merged | egrep -v \"(\\*|master|main|dev|develop)\" | xargs -r git branch -d" cleanup = "!git branch --merged | egrep -v \"(\\*|master|main|dev|develop)\" | xargs -r git branch -d"
history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
ignore = update-index --assume-unchanged ignore = update-index --assume-unchanged
[user] [user]
email = __[email]__ email = __[email]__
name = __[name]__ name = __[name]__
signingkey = __[signing_key]__ signingkey = __[signing_key]__
[url "git@github.com:"] [url "git@github.com:"]
insteadOf = https://github.com insteadOf = https://github.com
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
pager = delta
[fetch] [fetch]
prune = true prune = true
[rebase] [rebase]
autosquash = true autosquash = true
[diff] [diff]
colorMoved = zebra colorMoved = zebra
[commit] [commit]
gpgSign = true gpgSign = true
[sequence] [sequence]
editor = interactive-rebase-tool editor = interactive-rebase-tool
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
light = false
line-numbers = true
side-by-side = true
[merge]
conflictstyle = diff3
[diff]
colorMoved = default