mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-11-05 06:13:59 +01:00
Use delta as pager
This commit is contained in:
parent
d0c995222c
commit
758cc61488
1 changed files with 11 additions and 3 deletions
|
@ -37,9 +37,9 @@
|
||||||
pushtag = push --follow-tags
|
pushtag = push --follow-tags
|
||||||
[core]
|
[core]
|
||||||
editor = vim
|
editor = vim
|
||||||
attributesfile = /Users/gaugendre/.gitattributes
|
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
pager = less
|
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 }}
|
||||||
|
@ -47,6 +47,8 @@
|
||||||
smtpserverport = 465
|
smtpserverport = 465
|
||||||
smtppass = {{ (bitwarden "item" "Migadu email").login.password | quote }}
|
smtppass = {{ (bitwarden "item" "Migadu email").login.password | quote }}
|
||||||
confirm = auto
|
confirm = auto
|
||||||
|
[diff]
|
||||||
|
colorMoved = default
|
||||||
[diff "color"]
|
[diff "color"]
|
||||||
textconv=pygmentize
|
textconv=pygmentize
|
||||||
[diff "pandoc2md"]
|
[diff "pandoc2md"]
|
||||||
|
@ -57,6 +59,12 @@
|
||||||
textconv=exiftool
|
textconv=exiftool
|
||||||
[diff "ziplist"]
|
[diff "ziplist"]
|
||||||
textconv=unzip -l
|
textconv=unzip -l
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
[delta]
|
||||||
|
navigate = true
|
||||||
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
[init]
|
[init]
|
||||||
|
@ -64,4 +72,4 @@
|
||||||
[advice]
|
[advice]
|
||||||
detachedHead = false
|
detachedHead = false
|
||||||
[includeIf "gitdir:~/Projects/itsf/**"]
|
[includeIf "gitdir:~/Projects/itsf/**"]
|
||||||
path = ~/Projects/itsf/.gitconfig
|
path = {{ .chezmoi.homeDir }}/Projects/itsf/.gitconfig
|
||||||
|
|
Loading…
Reference in a new issue