From cbc8bede7ab813016816fe9b697ef174d13a7596 Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@gmail.com>
Date: Wed, 24 Mar 2021 20:44:50 -0400
Subject: [PATCH] Correct git pull warning

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

diff --git a/gitconfig b/gitconfig
index 7b0c8d6..21d1951 100644
--- a/gitconfig
+++ b/gitconfig
@@ -51,3 +51,5 @@
 [diff "enc"]
   textconv = bundle exec rails encrypted:show
   cachetextconv = false
+[pull]
+	ff = only