skip merges during ChangeLog generation

10 years ago · 9a4be0af5f
1 changed files with 1 additions and 1 deletions
--- 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