From: Vincent Bernat <vincent@bernat.im>
Date: Thu, 7 Apr 2016 05:38:22 +0000 (+0200)
Subject: build: don't include merges into changelog
X-Git-Tag: 0.9.3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54688af94b47344a300ff33331a28c31228fc82b;p=thirdparty%2Flldpd.git

build: don't include merges into changelog
---

diff --git a/Makefile.am b/Makefile.am
index c7a1913b..79cb43f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ ChangeLog: __force-changelog-generation
 		for tag in $$(git tag | $(EGREP) '^[0-9]+(\.[0-9]+){1,}$$' | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr); do \
 			if [ x"$$prev" = x ]; then prev=$$tag ; fi ; \
 			if [ x"$$prev" = x"$$tag" ]; then continue; fi ; \
-			echo "$$prev [$$(git log $$prev -1 --pretty=format:'%ai')]:" ; \
+			echo "$$prev [$$(git log --no-merges $$prev -1 --pretty=format:'%ai')]:" ; \
 			echo "" ; \
 			git log --pretty=' - [%h] %s (%an)' $$tag..$$prev ; \
 			echo "" ; \