From 0ec82b3cd4654bcc22bc7c0179bd3ef760f52127 Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Mon, 9 Nov 2009 16:10:24 -1000
Subject: Ignore merge commit messages when generating the rpm changelog.

---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) ; \
-- 
cgit