From d80339eaef7d5f07d07cb395c9d37b6fbe9e182f Mon Sep 17 00:00:00 2001
From: Ben Harris <ben@tilde.team>
Date: Sat, 11 Aug 2018 15:03:04 -0400
Subject: [PATCH] pull.ff only

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

diff --git a/git/.gitconfig b/git/.gitconfig
index a4d8591..92f196f 100755
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -6,3 +6,5 @@
 	default = simple
 [commit]
 	gpgsign = true
+[pull]
+	ff = only