From b4609c58002ab35eb89eb58ffadbaa282fae3519 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 10 Jun 2020 16:25:22 +0300
Subject: [PATCH] Modern git requires pull.ff setting

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

diff --git a/git/.gitconfig b/git/.gitconfig
index c5eff0d..0263b61 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -36,3 +36,5 @@
 	lineNumber = true
 [merge]
 	tool = vimdiff
+[pull]
+	ff = only
-- 
2.44.0