diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1eb0a65..24f0c59 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -46,9 +46,17 @@ jobs:
       - name: Lint commits
         # yamllint disable-line rule:line-length
         run: |
-          if test "${{ github.event.before }}" = "${{ github.event.after }}" || test -z "${{ github.event.before }}"
+          if test "${{ github.event_name}}" = "pull_request"
           then
-            gitlint --debug --commit "${{ github.event.after }}"
+            base="${{ github.event.pull_request.base.sha }}"
+            head="${{ github.event.pull_request.head.sha }}"
           else
-            gitlint --debug --commits "${{ github.event.before }}..${{ github.event.after }}"
+            base="${{ github.event.before }}"
+            head="${{ github.event.after }}"
+          fi
+          if test "${base}" = "${head}" || test -z "${base}"
+          then
+            gitlint --debug --commit "${head}"
+          else
+            gitlint --debug --commits "${base}..${head}"
           fi
diff --git a/.gitlint b/.gitlint
index e3a33c3..7b95c9b 100644
--- a/.gitlint
+++ b/.gitlint
@@ -32,7 +32,7 @@ line-length=72
 min-length=20
 
 [body-is-missing]
-ignore-merge-commits=false
+ignore-merge-commits=true
 
 [ignore-body-lines]
 regex=(^Co-Authored-By)|(^Reported-by)|(^Signed-off-by)