[beast: 205/210] BUILD: mkrelease.sh: ChangeLog: include merge commits in history

[Tim Janik <timj src gnome org>]

commit 83f2df36e37ed2a7f7adfac3fdfa972a09423e41
Author: Tim Janik <timj gnu org>
Date:   Tue Jun 18 03:10:13 2013 +0200

    BUILD: mkrelease.sh: ChangeLog: include merge commits in history

 mkrelease.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/mkrelease.sh b/mkrelease.sh
index 63d9fce..fe4b35b 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -114,7 +114,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 --no-merges --date=short --pretty='%ad  %an  # %h%n%n%s%n%n%b' --abbrev=11 
${R_REVISION:-HEAD} \
+  git log $FIRST --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'