Skip to content

Commit ad31877

Browse files
committed
Ignore merge commits when generating changelog
1 parent c5527b7 commit ad31877

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.idea/modules.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/generate-changelog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ if [ "$?" == "0" ]; then
55
THIS_TAG=$(git describe --tags --abbrev=0)
66
LAST_TAG=$(git describe --tags --abbrev=0 ${THIS_TAG}^)
77

8-
git log $LAST_TAG...$THIS_TAG --oneline | grep -v 'Merge pull request' | cut -d' ' -f2- | sed -e 's/^/* /'
8+
git log --no-merges $LAST_TAG...$THIS_TAG --oneline | grep -v 'Merge pull request' | cut -d' ' -f2- | sed -e 's/^/* /'
99

1010
else
1111
LAST_TAG=$(git describe --tags --abbrev=0)
1212

13-
git log $LAST_TAG...HEAD --oneline | grep -v 'Merge pull request' | cut -d' ' -f2- | sed -e 's/^/* /'
13+
git log --no-merges $LAST_TAG...HEAD --oneline | grep -v 'Merge pull request' | cut -d' ' -f2- | sed -e 's/^/* /'
1414
fi

0 commit comments

Comments
 (0)