From c463f87c65fd0f94545cfcfe7c1e4325ce4e7b99 Mon Sep 17 00:00:00 2001
From: sev <git@sev.monster>
Date: Mon, 8 Jun 2020 04:25:07 -0500
Subject: [PATCH] gitconfig: ff only

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

diff --git a/base/.gitconfig b/base/.gitconfig
index a2804de..91550b2 100644
--- a/base/.gitconfig
+++ b/base/.gitconfig
@@ -5,3 +5,5 @@
 [alias]
 	push-all = !git remote | xargs -n1 git push
 	submodules-pull = submodule foreach git pull origin master
+[pull]
+	ff = only
-- 
2.47.0