git: disable pull.ff=only for now

See https://lore.kernel.org/git/CAMMLpeSgSTU+SVeU6A_9LJvjVbho+QC8HpNQtKJvFic98xKvJQ@mail.gmail.com/T/#t and surrounding discussion for details.
benknoble · Feb 12, 2025 · 9675258 · 9675258
1 parent 151d67d
commit 9675258
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/links/gitconfig b/links/gitconfig
@@ -84,9 +84,6 @@
 	recurseSubmodules = check
 	useForceIfIncludes = true
 	default = current
-[pull]
-	ff = only
-	; rebase = merges
 [submodule]
 	fetchJobs = 4