From f7c229fcf681c017750ee6a33cdf8f248c9434e1 Mon Sep 17 00:00:00 2001
From: aleidk <ale.navarro.parra@gmail.com>
Date: Wed, 27 Nov 2024 19:13:12 -0300
Subject: [PATCH] add no-ff to global git config

---
 config/git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/git/config b/config/git/config
index 65fa801..faff1ec 100644
--- a/config/git/config
+++ b/config/git/config
@@ -10,5 +10,7 @@
   path = ~/.config/git/config-work
 [merge]
 	autoStash = true
+	edit = no
+	ff = no
 [rebase]
 	autoStash = true