From 8aed500052fda6280e965059cc4af1ed0ab32cb8 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sat, 23 May 2020 11:08:26 +0200
Subject: git: allow only fast-forwards when pulling

since 2.27 git warns if no pull strategy is configured.
options are merging, rebasing or allowing only ffs.
as both merging and rebasing can be annoying, try to only
use ffs. if that's not possible, manual merging/rebasing is still
possible.
---
 git/gitconfig | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'git')

diff --git a/git/gitconfig b/git/gitconfig
index 01b5277..00cb691 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -37,3 +37,6 @@
 
 [tig]
 	diff-highlight = true
+
+[pull]
+	ff = only
-- 
cgit v1.2.3