From 172990f33e225741b098bdb0ff9a61536b3d92e2 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Thu, 15 Sep 2022 20:52:50 +0200
Subject: Added nvim gitsigns extension, trying to set vimdiff with neovim

---
 config/git/config.darwin |  2 ++
 config/git/config.linux  | 10 ++++++++++
 2 files changed, 12 insertions(+)

(limited to 'config/git')

diff --git a/config/git/config.darwin b/config/git/config.darwin
index 9cb547f..0830442 100644
--- a/config/git/config.darwin
+++ b/config/git/config.darwin
@@ -13,3 +13,5 @@
 	defaultBranch = master
 [core]
 	editor = nvim
+
+# vim:ft=gitconfig
diff --git a/config/git/config.linux b/config/git/config.linux
index 3c72be1..96319cb 100644
--- a/config/git/config.linux
+++ b/config/git/config.linux
@@ -8,6 +8,12 @@
 	rebase = false
 [merge]
 	tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    keepBackup = false
+    prompt = false
+[mergetool "vimdiff"]
+    cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='"
 [commit]
 	gpgsign = true
 [init]
@@ -18,3 +24,7 @@
     prompt = false
 [diff]
 	tool = bat
+[core]
+	editor = nvim
+
+# vim:ft=gitconfig
-- 
cgit