diff --git a/private_dot_config/git/config b/private_dot_config/git/config index 1305f0e..dab62d1 100644 --- a/private_dot_config/git/config +++ b/private_dot_config/git/config @@ -1,17 +1,44 @@ +[core] + excludesfile = ~/.config/git/ignore + attributesfile = ~/.config/git/attributes + pager = delta + [user] name = Xavier Logerais email = xavier@logerais.com [credential] - helper = cache - helper = !type pass-git-helper >/dev/null && pass-git-helper $@ + helper = cache + +[credential "https://gitea.logerais.com"] + helper = cache + helper = !tea login helper + +[credential "https://gitea.cloud.logerais.com"] + helper = cache + helper = !tea login helper [init] defaultBranch = main + [rerere] enabled = 1 + [merge] conflictstyle = diff3 -[core] - excludesfile = ~/.config/git/ignore - attributesFile = ~/.config/git/attributes + +[page] + diff = delta + show = delta + log = delta + blame = delta + reflog = delta + +[delta] + navigate = true + side-by-side = true + dark = true + syntax-theme = Coldark-Dark + +[interactive] + diffFilter = delta --color-only