Skip to content

Commit

Permalink
build: don't include merges into changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentbernat committed Apr 7, 2016
1 parent da95763 commit 54688af
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -17,7 +17,7 @@ ChangeLog: __force-changelog-generation
for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \
if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \
if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \
echo "$$prev [$$(git log $$prev -1 --pretty=format:'%ai')]:" ; \
echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \
echo "" ; \
git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \
echo "" ; \
Expand Down

0 comments on commit 54688af

Please sign in to comment.