From 390f2e5db7c5cb332226697931375e0e3708f2ee Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Mon, 6 Mar 2023 20:22:55 +0100 Subject: Added git config fast forward merge --- config/git/config.linux | 1 + 1 file changed, 1 insertion(+) (limited to 'config/git/config.linux') diff --git a/config/git/config.linux b/config/git/config.linux index 2aa5963..f9bbcab 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -9,6 +9,7 @@ [merge] tool = vimdiff conflictstyle = diff3 + ff = true [mergetool] keepBackup = false prompt = false -- cgit