isync

commit 9a4be0af5f37aeceb4e2ac807f5e6242b3ddc515
parent 3db3f4718e05751ef3541742552d33e7fc4a3937
Author: Oswald Buddenhagen <ossi@users.sf.net>
Date:   Sun, 11 Jan 2015 14:18:34 +0100

skip merges during ChangeLog generation

Diffstat:
M
Makefile.am
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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