From 1cabb767da131e0824930589a49e7dfb37c9677a Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Fri, 31 Mar 2023 09:21:57 +0300
Subject: [PATCH] gitconfig: enable merge verifySignatures & renormalize, log
 mailmap & showsignature

---
 .mikaela/gitconfig | 5 +++++
 conf/gitconfig     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index 76f5e027..bb3c8dd3 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -45,6 +45,8 @@
 	helper = cache --timeout=86400
 [merge]
 	ff = only
+	verifySignatures = true
+	renormalize = true
 [format]
 	signOff = true
 [commit]
@@ -86,3 +88,6 @@
 [lfs]
 	setlockablereadonly = true
 	locksverify = true
+[log]
+	mailmap = true
+	showSignature = true
diff --git a/conf/gitconfig b/conf/gitconfig
index 8387b11f..dbf00c98 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -45,6 +45,8 @@
 	helper = cache --timeout=86400
 [merge]
 	ff = only
+	verifySignatures = true
+	renormalize = true
 [format]
 	signOff = true
 [commit]
@@ -86,3 +88,6 @@
 [lfs]
 	setlockablereadonly = true
 	locksverify = true
+[log]
+	mailmap = true
+	showSignature = true