From 5ff1dc226bd33494d1d6695a04ace9031eb99e97 Mon Sep 17 00:00:00 2001
From: Hendrik Jäger <gitcommit@henk.geekmail.org>
Date: Mon, 7 Dec 2020 13:51:06 +0100
Subject: Disable "ff-only" for merges because it blocks subtree merges

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

(limited to '.config/git/config')

diff --git a/.config/git/config b/.config/git/config
index 7409bda..0cc4236 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -40,8 +40,6 @@
   # show short ref names but only in terminal
   decorate = auto
 [merge]
-  # only do fastforward merges
-  ff = only
   # use vimdiff as mergetool
   tool = vimdiff
 [pretty]
-- 
cgit v1.2.3