mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-11-22 06:28:08 +01:00
Remove delta diff viewer
This commit is contained in:
parent
d870ead1ab
commit
3d08b00020
1 changed files with 0 additions and 5 deletions
|
@ -40,7 +40,6 @@
|
||||||
editor = vim
|
editor = vim
|
||||||
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
|
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
pager = delta
|
|
||||||
[sendemail]
|
[sendemail]
|
||||||
smtpserver = smtp.migadu.com
|
smtpserver = smtp.migadu.com
|
||||||
smtpuser = {{ (bitwarden "item" "Migadu email").login.username }}
|
smtpuser = {{ (bitwarden "item" "Migadu email").login.username }}
|
||||||
|
@ -60,10 +59,6 @@
|
||||||
textconv=exiftool
|
textconv=exiftool
|
||||||
[diff "ziplist"]
|
[diff "ziplist"]
|
||||||
textconv=unzip -l
|
textconv=unzip -l
|
||||||
[interactive]
|
|
||||||
diffFilter = delta --color-only
|
|
||||||
[delta]
|
|
||||||
navigate = true
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
[pull]
|
[pull]
|
||||||
|
|
Loading…
Reference in a new issue