From 351a3efdf110c0c0925fe609ff6a52fa2e3a8ff4 Mon Sep 17 00:00:00 2001 From: foreverpyrite Date: Sat, 1 Nov 2025 13:04:29 +0000 Subject: [PATCH] Basic gitconfig Still need a proper gitmerge tool I think. --- git/.gitconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 git/.gitconfig diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..367b53e --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,19 @@ +[user] + name = foreverpyrite + email = git@foreverpyrite.com + +[init] + defaultBranch = main + +[core] + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection + +[merge] + conflictStyle = zdiff3