From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 28 Nov 2016 16:56:49 +0000 (+0000)
Subject: Allow fast forwarding
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=134262a732f012addd87273bfa4a3c943fa6d3ed;p=max%2Fdotfiles.git

Allow fast forwarding
---

diff --git a/git/.gitconfig b/git/.gitconfig
index c1dab1f..778a220 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -12,7 +12,7 @@
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse
-        ff = false
+        ff = true
 [push]
 	default = simple
 [alias]