From e53e95540e5d143ba52bd1171c96753ebf201744 Mon Sep 17 00:00:00 2001
From: Stephen Morgan <morgan.stephen99@gmail.com>
Date: Mon, 27 Sep 2021 23:22:00 +1000
Subject: [PATCH] =?UTF-8?q?ci:=20Recognise=20any=20commit=20starting=20wit?=
 =?UTF-8?q?h=20=E2=80=98Merge=E2=80=99=20as=20a=20merge=20commit,=20which?=
 =?UTF-8?q?=20is=20ignored=20by=20commitlint.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/commitlint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/commitlint b/bin/commitlint
index 2c5fe4cd4..70dc8e38b 100755
--- a/bin/commitlint
+++ b/bin/commitlint
@@ -55,7 +55,7 @@ function checkmsg()
 
     # Is this some boring commit, eg a hard-to avoid github merge commit ?
     # Ignore those.
-    if echo "$SUMMARY" | grep -qE '^Merge \w{40} into \w{40}'
+    if echo "$SUMMARY" | grep -qE '^Merge'
     then 
         # shellcheck disable=SC2059
         printf "$FMT" "$HASH" "$SUMMARY" "[ignored]"