From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Thu, 29 Sep 2016 15:54:25 +0000 (+0100)
Subject: No fastforward merges by default
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=5e2fc56bcb7dcf29179e6bf0ac965e37506cd3d1;p=max%2Fdotfiles.git

No fastforward merges by default
---

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]