From e87bcd69dfcdc63888933cc04bab2081e10494b7 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnau@debian.org>
Date: Tue, 19 Apr 2011 06:14:09 +0200
Subject: When generating ChangeLog file, do not show the merges.

Signed-off-by: Lucas Bonnet <lucas@rincevent.net>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a07a790..dd2ba1d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ MAN1DIR=$(PREFIX)/share/man/man1
 SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
 
 INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
-CHANGELOG_CMD = git log --pretty=medium
+CHANGELOG_CMD = git log --pretty=medium --no-merges
 
 # The currently released version of EMMS
 VERSION=3.0
-- 
cgit v1.2.3