From 790fcf9ae072d2c1d576d1c7e42223b1d85f7268 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 31 Aug 2020 18:41:21 -0600
Subject: [PATCH] git: pull.ff only

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

diff --git a/applications/gitconfig b/applications/gitconfig
index 30e13c0..25f0bc6 100644
--- a/applications/gitconfig
+++ b/applications/gitconfig
@@ -5,3 +5,5 @@
 	editor = vi
 [gui]
 	spellingdictionary = none
+[pull]
+	ff = only