From c2324b8cb2635ee27a27e5ca840c4a5e65c9ae97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergiolain11@gmail.com>
Date: Mon, 20 Nov 2023 12:19:43 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20config(git):=20added=20mer?=
 =?UTF-8?q?ge=20options=20to=20commitizen=20and=20gitconfig=20alias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .czrc      | 3 ++-
 .gitconfig | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.czrc b/.czrc
index 32b51d26..0c1b9659 100644
--- a/.czrc
+++ b/.czrc
@@ -54,7 +54,8 @@
     {
       "value": "📁 files",
       "name": "📁 files:    Changes in files or directories"
-    }
+    },
+    { "value": "🔀 merge", "name": "🔀 merge:   Merge branch or pull request" }
   ],
   "allowCustomScopes": true,
   "allowBreakingChanges": ["✨ feat", "🐛 fix"]
diff --git a/.gitconfig b/.gitconfig
index 9a052718..02f4fec4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -101,7 +101,7 @@
 	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
 	ms = merge --skip