From cdda1bd20dc1dae98db5dd82d0f42bd9632337f5 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Tue, 30 Jun 2020 22:47:29 +0300
Subject: [PATCH] git: --ff by default

---
 etc/soft/git/gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/soft/git/gitconfig b/etc/soft/git/gitconfig
index 494f2d4..7195480 100644
--- a/etc/soft/git/gitconfig
+++ b/etc/soft/git/gitconfig
@@ -17,6 +17,9 @@
 [color]
 	ui = true
 
+[pull]
+	ff = only
+
 [merge]
 	tool = vimdiff