From 5e2fc56bcb7dcf29179e6bf0ac965e37506cd3d1 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Thu, 29 Sep 2016 16:54:25 +0100
Subject: [PATCH] No fastforward merges by default

---
 git/.gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc715..f2d54ab 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -12,6 +12,7 @@
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse
+        ff = false
 [push]
 	default = simple
 [alias]
-- 
2.45.2