[beast: 80/95] BUILD: generate ChangeLog with unfolded merge history

[Tim Janik <timj src gnome org>]

commit f6af5a6d49dafa2caceea142004c30356eefc383
Author: Tim Janik <timj gnu org>
Date:   Fri Nov 23 04:06:39 2012 +0100

    BUILD: generate ChangeLog with unfolded merge history

 mkrelease.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/mkrelease.sh b/mkrelease.sh
index f367c02..3018137 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -108,7 +108,7 @@ done
     die 9 "Failed to create temporary file"
   trap "rm -f $TEMPF" 0 HUP INT QUIT TRAP USR1 PIPE TERM
   # Generate ChangeLog with -prefixed records
-  git log --first-parent --date=short --pretty='%ad  %an      # %h%n%n%s%n%n%b' --abbrev=11 
${R_REVISION:-HEAD} \
+  git log --no-merges --date=short --pretty='%ad  %an         # %h%n%n%s%n%n%b' --abbrev=11 
${R_REVISION:-HEAD} \
   | {
     # Tab-indent ChangeLog, except for record start
     sed 's/^/  /; s/^  //; /^[        ]*<unknown>$/d'