[mm-common] Do not show merge commits in generated ChangeLog

[Daniel Elstner <daniel src gnome org>]

commit a48966794c9d04f013f2d90bb430c5a75e640575
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Sep 17 20:41:30 2009 +0200

    Do not show merge commits in generated ChangeLog
    
    * build/dist-changelog.am (dist-changelog): Add --no-merge option to
    exclude merge commits from the output.  The individual merged commits
    are still shown.

 build/dist-changelog.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/build/dist-changelog.am b/build/dist-changelog.am
index 5125052..ddfdb76 100644
--- a/build/dist-changelog.am
+++ b/build/dist-changelog.am
@@ -25,7 +25,7 @@ endif
 
 dist-changelog:
 	@if git --git-dir="$(top_srcdir)/.git" --work-tree="$(top_srcdir)" \
-		log --date=short --pretty='format:%cd  %an  <%ae>%n%n%s%n%n%b%n' | \
+		log --no-merges --date=short --pretty='tformat:%cd  %an  <%ae>%n%n%s%n%n%b' | \
 	 $(SED)	-e '/^[12]...-[01].-[0123].  [^<>]*  <[^<>]*>$$/,/^$$/ b' \
 		-e '/[^	 ]/,/^[	 ]*$$/! d' \
 		-e 's/^[	 ]*/	/' \