From 599522f087dfd0679313996adb5adc97b551d70c Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Wed, 17 Aug 2016 17:01:27 +1200
Subject: Only pull if rebase possible

Force me to fetch and merge properly otherwise
---
 git/gitconfig.m4 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
index dfe46157..73bdae98 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4
@@ -26,6 +26,9 @@
 [merge]
     ff = false
 
+[pull]
+    ff = only
+
 [push]
     default = current
 
-- 
cgit v1.2.3