aboutsummaryrefslogtreecommitdiff
path: root/config/git/config.darwin
diff options
context:
space:
mode:
authorCharles Cabergs <charles.cabergs@colruytgroup.com>2023-09-27 13:59:32 +0200
committerCharles Cabergs <charles.cabergs@colruytgroup.com>2023-09-27 13:59:32 +0200
commit586b14a58945798f2ca1c38c6f3660b9384d36b5 (patch)
tree79ffec263e27216e7d302ffd8d3f440bf274f69b /config/git/config.darwin
parent2c7be2b3f5b68ecb6d55097e97dccbeb58d12246 (diff)
downloaddotfiles-586b14a58945798f2ca1c38c6f3660b9384d36b5.tar.gz
dotfiles-586b14a58945798f2ca1c38c6f3660b9384d36b5.tar.bz2
dotfiles-586b14a58945798f2ca1c38c6f3660b9384d36b5.zip
Add delta git config and bat as a man pager
Diffstat (limited to 'config/git/config.darwin')
-rw-r--r--config/git/config.darwin26
1 files changed, 26 insertions, 0 deletions
diff --git a/config/git/config.darwin b/config/git/config.darwin
index 7d27b5b..dd3f5b0 100644
--- a/config/git/config.darwin
+++ b/config/git/config.darwin
@@ -7,11 +7,37 @@
rebase = false
[merge]
tool = vimdiff
+ conflictstyle = diff3
[commit]
gpgsign = false
[init]
defaultBranch = master
[core]
editor = "VIMINIT='' nvim"
+ pager = delta
+[interactive]
+ diffFilter = delta --color-only --syntax-theme gruvbox-dark
+[diff]
+ colorMoved = default
+[delta]
+ syntax-theme = gruvbox-dark
+ # side-by-side = true
+ navigate = true # use n and N to move between diff sections
+ line-numbers = true
+
+
+# [http]
+# sslVerify = false
+[credential]
+ helper = store
+[filter "lfs"]
+ required = true
+ clean = git-lfs clean -- %f
+ smudge = git-lfs smudge -- %f
+ process = git-lfs filter-process
+[gpg]
+ format = ssh
+[gpg "ssh"]
+ allowedSignersFile =
# vim:ft=gitconfig