summaryrefslogtreecommitdiffstats
path: root/dotfiles/git
diff options
context:
space:
mode:
authorSkullheadx <andrew@andrew-montgomery.dev>2026-06-30 12:43:03 -0400
committerSkullheadx <andrew@andrew-montgomery.dev>2026-06-30 12:43:03 -0400
commit98103d38c525791228da1e3fcbb1021e6c02cfce (patch)
treeb16a801edfb74c60353b75d0b0e0b3de86957477 /dotfiles/git
parentadd more utilities to darwin (diff)
downloadnixos-98103d38c525791228da1e3fcbb1021e6c02cfce.tar.gz
nixos-98103d38c525791228da1e3fcbb1021e6c02cfce.tar.bz2
nixos-98103d38c525791228da1e3fcbb1021e6c02cfce.zip
try git delta
Diffstat (limited to 'dotfiles/git')
-rw-r--r--dotfiles/git/config22
1 files changed, 22 insertions, 0 deletions
diff --git a/dotfiles/git/config b/dotfiles/git/config
new file mode 100644
index 0000000..feaae67
--- /dev/null
+++ b/dotfiles/git/config
@@ -0,0 +1,22 @@
+[user]
+ name = Skullheadx
+ email = andrew@andrew-montgomery.dev
+
+[pull]
+ rebase = true
+
+[url "git@github.com:"]
+ insteadOf = https://github.com/
+
+[core]
+ pager = delta
+
+[interactive]
+ diffFilter = delta --color-only
+
+[delta]
+ navigate = true
+ dark = true
+
+[merge]
+ conflictStyle = zdiff3