diff --git a/local/development/commit-msg b/local/development/commit-msg index b12c4a838e..0cdf739b1f 100644 --- a/local/development/commit-msg +++ b/local/development/commit-msg @@ -8,7 +8,7 @@ fi commitTitle="$(cat $1 | head -n1)" # ignore merge requests -if echo "$commitTitle" | grep -qE "^Merge branch '.*"; then +if echo "$commitTitle" | grep -qE "^Merge (remote-tracking )?branch '.*"; then echo "Commit hook: ignoring branch merge" exit 0 fi