From db762fb33867d78d33d98e7ded0981a9caa52d41 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 22 Jun 2024 13:51:05 +0200
Subject: ff true

---
 config/essentials/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/essentials')

diff --git a/config/essentials/git/config b/config/essentials/git/config
index 99cf21e..2b2b202 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -9,7 +9,7 @@
 [pull]
 	rebase = false
 [merge]
-	ff = false
+	ff = true
 [alias]
 	change-commits = "!f() { VAR1=$1; VAR='$'$1; OLD=$2; NEW=$3; echo \"Are you sure for replace $VAR  $OLD => $NEW ?(Y/N)\";read OK;if [ \"$OK\" = 'Y' ] ; then shift 3; git filter-branch  --env-filter \"if [ \\\"${VAR}\\\" = '$OLD' ]; then export $VAR1='$NEW';echo 'to $NEW'; fi\" $@; fi;};  f "
 [commit]
-- 
cgit v1.2.3