Skip to content

O
oh-my-zsh
Unverified Commit 0e7d7b87 authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

feat(changelog): ignore merge commits

parent e32d4b1e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
tools/changelog.sh
View file @ 0e7d7b87
...@@ -114,6 +114,11 @@ function parse-commit { ...@@ -114,6 +114,11 @@ function parse-commit {
fi fi
} }
# Ignore commit if it is a merge commit
if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
return
fi
# Parse commit with hash $1 # Parse commit with hash $1
local hash="$1" subject body warning rhash local hash="$1" subject body warning rhash
subject="$(command git show -s --format=%s $hash)" subject="$(command git show -s --format=%s $hash)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment