From e743e3fbb8bf0ea538af21b3a830d2650efe6fe0 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 27 Apr 2024 20:52:09 -0400
Subject: [PATCH] change merge.tool to nvimdiff3, allow sops-mergetool to be
 executed anywhere

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 .gitconfig | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index f4f2359..3c69d8f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,9 +1,7 @@
 [mergetool "sops-mergetool"]
-        cmd = ./sops-mergetool.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+        cmd = bash -c "$(git --exec-path)/sops-mergetool.sh \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
 [merge]
-	tool = nvimdiff
-[merge "nvimdiff"]
-	layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"
+	tool = nvimdiff3
 [push]
 	autoSetupRemote = true
 [core]
@@ -17,3 +15,8 @@
 [branch "main"]
 	remote = origin
 	merge = refs/heads/main
+	pushRemote = origin
+[branch "feature/palatine-hill-nut-2.0"]
+	pushRemote = origin
+	remote = origin
+	merge = refs/heads/feature/palatine-hill-nut-2.0