summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Weipert <code@drogueronin.de>2022-01-20 12:31:47 +0100
committerDaniel Weipert <code@drogueronin.de>2022-01-20 12:31:47 +0100
commit6bf96f24c6483efd306c0eb367d4ddc4df0d423b (patch)
treea5b4e7e4cb3a06dc8333ed43e1d56f9d5d6dcef0
parentccd321f339f43b6321dbdf54bd989f279601f8aa (diff)
Uses nvim as git difftool
-rw-r--r--.gitconfig15
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitconfig b/.gitconfig
index 1fb153a..754ecd2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,14 @@
[init]
- defaultBranch = main
+ defaultBranch = main
+
[user]
- name = Daniel Weipert
- email = code@drogueronin.de
+ name = Daniel Weipert
+ email = code@drogueronin.de
+
+[diff]
+ tool = nvimdiff
+[difftool]
+ prompt = false
+[difftool "nvimdiff"]
+ cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
+