Disable "ff-only" for merges because it blocks subtree merges

diff --git a/.config/git/config b/.config/git/config
index 7409bdae9c7337e80e8b3eed436f460fe6b2eb7a..0cc42369ba4f2149eaed61ac7a878bbfd8a7b53c 100644 (file)
--- 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]