summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
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) ; \