From 30fbc2f9c3c00c96af73efdce9f1f9436e553267 Mon Sep 17 00:00:00 2001
From: Snoweuph <snow+git@euph.email>
Date: Sun, 2 Jun 2024 19:30:27 +0200
Subject: [PATCH] Improve git Config

---
 .config/nvim/lua/plugins/git.lua | 6 ++++++
 .gitconfig                       | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua
index 5f495eb..ea9ea27 100644
--- a/.config/nvim/lua/plugins/git.lua
+++ b/.config/nvim/lua/plugins/git.lua
@@ -19,4 +19,10 @@ return {
             vim.keymap.set("n", "<leader>go", ":Git <CR>", { desc = "Open Git" })
         end,
     },
+    {
+        "moyiz/git-dev.nvim",
+        lazy = true,
+        cmd = { "GitDevOpen", "GitDevCleanAll" },
+        opts = {},
+    },
 }
diff --git a/.gitconfig b/.gitconfig
index 4a9d77a..38ead68 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,11 +8,9 @@
 	autosetupremote = true
 [help]
 	autoCorrect = prompt
-[merge]
-	tool = meld
-	conflictstyle = zdiff3
 [core]
 	editor = nvim
+	pager = /usr/share/git-core/contrib/diff-highlight | less
 [diff]
 	colorMoved = default
 [fetch]
@@ -21,3 +19,5 @@
 [alias]
 	adog = log --all --decorate --oneline --graph
 	fl = push --force-with-lease
+[interactive]
+	diffFilter = /usr/share/git-core/contrib/diff-highlight