mirror of
https://github.com/Matir/skel.git
synced 2026-05-26 05:29:09 -07:00
Use delta when available
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
excludesfile = ~/.gitignore
|
||||
editor = vim
|
||||
whitespace = trailing-space,space-before-tab
|
||||
pager = command -v delta >/dev/null 2>&1 && delta || less -eFiJM~ -j3
|
||||
|
||||
[color]
|
||||
diff = auto
|
||||
@@ -13,6 +14,7 @@
|
||||
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
colorMoved = default
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
@@ -58,16 +60,28 @@
|
||||
|
||||
[credential]
|
||||
helper = cache --timeout=36000
|
||||
|
||||
[receive]
|
||||
denyCurrentBranch = updateInstead
|
||||
|
||||
[merge]
|
||||
tool = vimdiff
|
||||
conflictstyle = diff3
|
||||
|
||||
[mergetool]
|
||||
prompt = false
|
||||
|
||||
[include]
|
||||
path = ~/.gitconfig.local
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
|
||||
[interactive]
|
||||
diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
|
||||
|
||||
[delta]
|
||||
navigate = true
|
||||
|
||||
Reference in New Issue
Block a user