matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 05:29:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use delta when available

Browse Source
This commit is contained in:
David Tomaschik
2022-03-19 15:53:34 -07:00
parent a49474fe60
commit 71711a5cc0
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dotfiles/gitconfig
View File

@@ -6,6 +6,7 @@
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
editor = vim editor = vim
whitespace = trailing-space,space-before-tab whitespace = trailing-space,space-before-tab
pager = command -v delta >/dev/null 2>&1 && delta || less -eFiJM~ -j3
[color] [color]
diff = auto diff = auto
@@ -13,6 +14,7 @@
[diff] [diff]
tool = vimdiff tool = vimdiff
colorMoved = default
[difftool] [difftool]
prompt = false prompt = false
@@ -58,16 +60,28 @@
[credential] [credential]
helper = cache --timeout=36000 helper = cache --timeout=36000
[receive] [receive]
denyCurrentBranch = updateInstead denyCurrentBranch = updateInstead
[merge] [merge]
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
[mergetool] [mergetool]
prompt = false prompt = false
[include] [include]
path = ~/.gitconfig.local path = ~/.gitconfig.local
[pull] [pull]
rebase = false rebase = false
[init] [init]
defaultBranch = main defaultBranch = main
[interactive]
diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
[delta]
navigate = true