From b95da100d815fe09b10b65a563551a16d4364691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= <nivertius@gmail.com>
Date: Fri, 21 Dec 2018 20:51:33 +0100
Subject: [PATCH] Make merge-commits require command-line argument

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

diff --git a/.gitconfig b/.gitconfig
index d837ae2..1ec5bea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -57,6 +57,8 @@
 	abbreviateCommands = true
 [commit]
 	verbose = true
+[merge]
+	ff = only
 [mergetool]
 	keepBackup = false
 [color "diff"]