From 8a4455766140f8dc2850b510524b32b09d37f92f Mon Sep 17 00:00:00 2001 From: tea Date: Sun, 23 Jun 2024 13:12:39 +0200 Subject: [PATCH] git: ff only globally --- .config/git/config | 1 + 1 file changed, 1 insertion(+) 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