From 134262a732f012addd87273bfa4a3c943fa6d3ed Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 28 Nov 2016 16:56:49 +0000
Subject: [PATCH] Allow fast forwarding

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

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]
-- 
2.46.2