skip merges during ChangeLog generation

This commit is contained in:
Oswald Buddenhagen 2015-01-11 14:18:34 +01:00
parent 3db3f4718e
commit 9a4be0af5f

View File

@ -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