From 52ffbcf0e73ca41d7288275c61a9004a2751804f Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Tue, 15 Sep 2015 19:39:44 +0100
Subject: [PATCH] Revert the no-ff Git change.

---
 .gitconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 3cc18ba..c9e6052 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -26,5 +26,3 @@
     ui = true
 [branch]
     autosetuprebase = always
-[merge]
-	ff = false