diff --git a/.husky/commit-msg b/.husky/commit-msg index c967b00b2..7efcfe92d 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,3 +1,8 @@ #!/usr/bin/env sh +# Merge commits +if git rev-parse -q --verify MERGE_HEAD >/dev/null 2>&1; then + exit 0 +fi + message="$(cat "$1")" node .husky/scripts/commit-msg.js "$message"