From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 10 Jun 2020 13:25:22 +0000 (+0300)
Subject: Modern git requires pull.ff setting
X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=commitdiff_plain;h=b4609c58002ab35eb89eb58ffadbaa282fae3519

Modern git requires pull.ff setting
---

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