From 211498d107647df9dc6dc37df8c585a1e40d593a Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Mon, 7 Feb 2022 16:23:30 +0100
Subject: [PATCH] git: only allow ff merges on pull

---
 git/.config/git/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git/.config/git/config b/git/.config/git/config
index 7844997..ab336b1 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -18,6 +18,9 @@
 [push]
     default = nothing
 
+[pull]
+    ff = only
+
 [merge]
     tool = vimdiff