Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: include merge commits in the changelog #139

Merged

Conversation

dsole
Copy link
Contributor

@dsole dsole commented Nov 13, 2016

By passing merges: null to the conventional-changelog function the default "--no-merges" git CLI argument is removed, and therefore both normal and merge commits are returned from the log for processing.
Note that setting it to true would have changed "--no-merges" to "--merges", causing only merges to be retrieved from the log.

Fixes #137

@coveralls
Copy link

coveralls commented Nov 13, 2016

Coverage Status

Coverage remained the same at 100.0% when pulling 66535be on dsole:137-inconsistent-merge-handling into 8e4ec4a on conventional-changelog:master.

Copy link
Member

@stevemao stevemao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bcoe
Copy link
Member

bcoe commented Nov 26, 2016

@dsole sorry for the slow turn around on standard-version these days, really appreciate the work.

@bcoe bcoe merged commit b6e1562 into conventional-changelog:master Nov 26, 2016
@bcoe
Copy link
Member

bcoe commented Nov 26, 2016

@dsole thanks a ton for the thoughtful contribution to the project, please take the upcoming release for a spin and make sure everything is working for you 👍

npm cache clear; npm i standard-version@next

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants