diff --git a/links/gitconfig b/links/gitconfig index 642c3de..66b0ef4 100644 --- a/links/gitconfig +++ b/links/gitconfig @@ -84,9 +84,6 @@ recurseSubmodules = check useForceIfIncludes = true default = current -[pull] - ff = only - ; rebase = merges [submodule] fetchJobs = 4