summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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\""
+