From 43dfbf673e97eadbc3a0962ae6f36f34f93074c9 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 27 Apr 2024 20:44:00 -0400
Subject: [PATCH] git config changes

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 .gitconfig | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .gitconfig

diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..f4f2359
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,19 @@
+[mergetool "sops-mergetool"]
+        cmd = ./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"
+[push]
+	autoSetupRemote = true
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[remote "origin"]
+	url = git@github.com:RAD-Development/nix-dotfiles.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "main"]
+	remote = origin
+	merge = refs/heads/main