diff --git a/.config/git/config b/.config/git/config index a279c24..2650780 100644 --- a/.config/git/config +++ b/.config/git/config @@ -14,6 +14,7 @@ autoSetupRemote = true [pull] rebase = true + ff = only [merge] tool = meld conflictStyle = diff3