aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97d4eb889..d935ce079 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
- name: Check commit message
run: |
# Get last commit message
- git log -1 --pretty=format:"%s" | grep -c "^[^#].{78}"
+ git log -1 --pretty=format:"%s" --no-merges | grep -c "^[^#].{78}"
if [ $? -eq 0 ]; then
echo "Last commit log contains a line with more than 78 characters."
exit 1