From 39f14d5da0b159a8c356bde046263c63aa4b028c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergiolain11@gmail.com>
Date: Mon, 20 Nov 2023 14:06:58 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20config(gitconfig):=20added?=
 =?UTF-8?q?=20merge,=20deleted=20before=20by=20accident?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 02f4fec4..91738f18 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -100,7 +100,8 @@
 	#############
 	ls = ls-files
 	lsf = !git ls-files | grep -i
-	#############
+  #############
+  m = merge
 	mm = merge --no-ff -m "🔀 merge: Merge branch '$(git symbolic-ref --short HEAD)' into '$(git branch --show-current)'"
 	ma = merge --abort
 	mc = merge --continue