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

git-changelog: option to only use merges #471

Merged
merged 1 commit into from Oct 18, 2015

Conversation

jankatins
Copy link
Contributor

using -m or --merges-only will only show the merge
commit messages. It will also use the body of the merge
commit message in addition to the subject, as github merges
usually have a useless subject line for commit messages.

If used with -n/--no-merges, the last one specified will win.

Will need regenerated man pages (.html + .1)

Closes: #470

@jankatins
Copy link
Contributor Author

A output of this:

n.n.n / 2015-10-18
==================

  * Merge pull request #466 from anarcat/master
    add simple sed command
  * Merge pull request #465 from spacewander/fix-color
    Fix color
  * Merge pull request #460 from apjanke/summary-defensive-locale
    git-summary: protect against character encoding issues with
    LC_ALL=C
  * Merge pull request #458 from apjanke/makefile-refactor-libs
    Makefile: refactor is-git-repo inclusion logic
  * Merge pull request #459 from apjanke/effort-portable-colors
    git-effort: use portable terminal escape sequences
  * Merge pull request #454 from apjanke/makefile-escape-mktemp
    Makefile: escape $ used inside eval as shell variable
  * Merge pull request #453 from jhnns/pr-url
    Add possibility to also checkout pull requests based on
    GitHub urls
  * Merge pull request #452 from akimd/summary-locale
    summary: beware of locale issues, and pass options to
    line-summary
  * Merge pull request #443 from Natim/patch-1
    Make sure git-authors doesn't return twice the same ones.
[...]

using `-m` or `--merges-only` will only show the merge
commit messages. It will also use the body of the merge
commit message in addition to the subject, as github merges
usually have a useless subject line for commit messages.

If used with `-n/--no-merges`, the last one specified will win.
@hemanth
Copy link
Collaborator

hemanth commented Oct 18, 2015

LGTM //cc @qw3rtman

@qw3rtman
Copy link
Collaborator

Looks good. Merging. 👍

@qw3rtman qw3rtman closed this Oct 18, 2015
@qw3rtman qw3rtman reopened this Oct 18, 2015
qw3rtman added a commit that referenced this pull request Oct 18, 2015
git-changelog: option to only use merges
@qw3rtman qw3rtman merged commit b804d36 into tj:master Oct 18, 2015
@qw3rtman
Copy link
Collaborator

@JanSchulz, I really like displaying the commit body under merge commits. Could you send in a pull request making that the default behavior (in git changelog) as well?

Thoughts @hemanth?

@jankatins
Copy link
Contributor Author

Done...

@qw3rtman qw3rtman mentioned this pull request Dec 27, 2015
tardypad pushed a commit to tardypad/git-extras that referenced this pull request Jul 13, 2016
git-changelog: option to only use merges
tardypad pushed a commit to tardypad/git-extras that referenced this pull request Jul 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants