From d4fc87b23f1be02bca2dde82e62ce0bb34dbfd12 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Mon, 7 Jun 2021 21:20:22 +0200
Subject: Git ff only

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

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index 50cf949..35153a4 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,3 +13,5 @@
 	ra = "!f() { read -p \"Author email: \" email; [ -n \"${email}\" ] && git config user.email ${email} && git commit --amend --reset-author; }; f"
 [push]
 	default = simple
+[pull]
+	ff = only
-- 
cgit v1.2.3