summaryrefslogtreecommitdiffstats
path: root/.config/git
diff options
context:
space:
mode:
Diffstat (limited to '.config/git')
-rw-r--r--.config/git/config15
1 files changed, 15 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
new file mode 100644
index 0000000..6f7086d
--- /dev/null
+++ b/.config/git/config
@@ -0,0 +1,15 @@
+[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
+ side-by-side = true
+
+[merge]
+ conflictstyle = zdiff3
+[init]
+ defaultBranch = master