From 348b953ff3a7cf1edf5e81c575314b80b55110cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kmie=C4=87?= <KmcR@viessmann.com>
Date: Sun, 12 Dec 2021 21:28:47 +0100
Subject: [PATCH] Git: verbose commit by default, nvim as mergetool

---
 .gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 1cbf7ff..8857513 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -37,6 +37,7 @@
 	d = diff
 	dc = diff --cached
 	short = rev-parse --short --verify HEAD
+	update = !git stash && git pull --rebase && git stash pop && git submodule update --init --recursive
 [interactive]
 	diffFilter = delta --color-only
 [delta]
@@ -48,3 +49,7 @@
 	file-decoration-style = none
 [pull]
 	rebase = true
+[commit]
+	verbose = true
+[mergetool "vimdiff"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'