From e1fe4815e06d00fecff784b2c9bf4538980afa87 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 10 Aug 2016 11:34:29 +1200
Subject: Don't fast-forward my merges

<http://stackoverflow.com/a/6810687>

I'll rebase if I do want this.
---
 git/gitconfig.m4 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
index ea6b1220..060740a2 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4
@@ -21,6 +21,9 @@
     date = local
     decorate = short
 
+[merge]
+    ff = false
+
 [push]
     default = matching
 
-- 
cgit v1.2.3