From 9bd1674894318ca9b37a81545b8ac9c918fcc1d5 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Sat, 20 Jun 2020 23:59:54 +0200
Subject: Pulling with fast-forward only by default.

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

diff --git a/.config/git/config b/.config/git/config
index 06c6e88..bca3150 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -103,6 +103,8 @@
   whitespace = nowarn
 [branch]
   autosetupmerge = true
+[pull]
+  ff = only
 [push]
   # 'git push' will push the current branch to its tracking branch
   # the usual default is to push all branches
-- 
cgit v1.2.3-70-g09d2