From 813b8d65f6a780ad61f708e9247b3e19d25e7f06 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scottwallace@ucds.email>
Date: Wed, 9 Sep 2015 13:32:20 +0100
Subject: [PATCH] Disable fast-forward merging.

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 091fc79..4b839db 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -25,3 +25,5 @@
     ui = true
 [branch]
     autosetuprebase = always
+[merge]
+	ff = false