From 9a4be0af5f37aeceb4e2ac807f5e6242b3ddc515 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Sun, 11 Jan 2015 14:18:34 +0100 Subject: [PATCH] skip merges during ChangeLog generation --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5141f7c..b47edf6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ $(srcdir)/ChangeLog: log log: @test -z "$(srcdir)" || cd $(srcdir) && \ ( ! test -d .git || \ - git log --date=iso --log-size --name-only | \ + git log --date=iso --log-size --name-only --no-merges | \ perl -e '$(LOG_PL)' > ChangeLog ) deb: deb-clean