[PATCH 3/3] Ignore merge commit messages when generating the rpm changelog.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cf11faa..27361ca 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) ; \
-- 
1.6.5.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux