update gitconfig to use delta
parent
0e426377cd
commit
1216e533fa
21
.gitconfig
21
.gitconfig
|
@ -12,6 +12,23 @@
|
||||||
filemode = true
|
filemode = true
|
||||||
eol = lf
|
eol = lf
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
features = side-by-side line-numbers #decorations
|
||||||
|
whitespace-error-style = 22 reverse
|
||||||
|
syntax-theme = zenburn
|
||||||
|
|
||||||
|
[delta "decorations"]
|
||||||
|
commit-decoration-style = bold yellow box ul
|
||||||
|
file-style = bold yellow ul
|
||||||
|
file-decoration-style = none
|
||||||
|
|
||||||
|
[rebase]
|
||||||
|
autoStash = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
@ -19,7 +36,7 @@
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
branch = auto
|
branch = auto
|
||||||
|
@ -53,5 +70,3 @@
|
||||||
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
||||||
up = pull --rebase
|
up = pull --rebase
|
||||||
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
|
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
|
||||||
[rebase]
|
|
||||||
autoStash = true
|
|
||||||
|
|
Reference in New Issue