From ae5d66671538169351666256b109ef2fb3a49de7 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Wed, 2 Nov 2022 19:14:51 +0100
Subject: [PATCH] Git: mergetool, autoSetupRemote

---
 .gitconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 619f0df..74bb254 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,11 +19,12 @@
     user = rad4day
 [pull]
     rebase = true
+[push]
+    autoSetupRemote = true
 [interactive]
     diffFilter = delta --color-only
 [delta]
     features = line-numbers decorations
-    syntax-theme = OneHalfDark
     whitespace-error-style = 22 reverse
 [delta "decorations"]
     commit-decoration-style = bold yellow box ul
@@ -37,3 +38,5 @@
 	defaultBranch = main
 [diff "dyff"]
 	command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"
+[merge]
+	tool = smerge