diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-11-09 16:10:24 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-11-12 15:58:13 -1000 |
| commit | 0ec82b3cd4654bcc22bc7c0179bd3ef760f52127 (patch) | |
| tree | 80f0c3e01ddd54a47e6fbe299d87954ee91a8699 | |
| parent | 13a27933b4b651317deec74cc80daaab5041d206 (diff) | |
| download | anaconda-0ec82b3cd4654bcc22bc7c0179bd3ef760f52127.tar.gz anaconda-0ec82b3cd4654bcc22bc7c0179bd3ef760f52127.tar.xz anaconda-0ec82b3cd4654bcc22bc7c0179bd3ef760f52127.zip | |
Ignore merge commit messages when generating the rpm changelog.
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index cf11faa21..27361cad2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,8 @@ rpmlog: @git log --pretty="format:- %s (%ae)" \ $(PACKAGE_NAME)-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE).. | \ sed -e 's/@.*)/)/' | sed -e 's/%/%%/g' | \ - grep -v -- "- Sending translation for " + grep -v -- "- Sending translation for " | \ + grep -v -- "- Merge commit " bumpver: @LAST=$$(echo $(PACKAGE_VERSION) | grep "\." -o | wc -l) ; \ |