From 78f664da444fc158b5b2a304583255139c477196 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 18 Jun 2017 15:46:55 +0200
Subject: [PATCH] git: disable merge pull

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

diff --git a/gitconfig.m4 b/gitconfig.m4
index 6d44781..5ecec98 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -8,5 +8,7 @@
 	diff = auto
 [push]
 	default = simple
+[pull]
+        ff = only
 [credential]
 	helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring || echo store')