diff --git a/.config/git/config b/.config/git/config index 341a6cc..bbaa246 100644 --- a/.config/git/config +++ b/.config/git/config @@ -27,6 +27,7 @@ path = user.config [pull] rebase = true + ff = yes [merge] log = true tool = nvimdiff