From d97c13721dfa52e8df8052c3947d2b060e0e7661 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 19 Dec 2016 09:47:20 +0100
Subject: merge options

---
 gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gitconfig b/gitconfig
index 6d8edf5..96ee73a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,7 +15,11 @@
 	branch = auto
 [http]
 	sslCAPath = /etc/ssl/certs
+[pull]
+	mergeoptions = --ff-only
+	ff = only
 [merge]
+	ff = false
 	summary = true
 	log = 5000
 [branch "debian-merge"]
-- 
cgit v1.2.3