Get rid of merge commits in the changelog

mozilla · Jun 20, 2014 · b1e60c1 · b1e60c1
1 parent bf03091
commit b1e60c1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,14 +1,10 @@
 rel2013_08_28.15.22.40:
 
-  * a48b888 Merge branch '91-use-pwdChangedTime'
   * 7129101 changed pwdChangeTime to pwdChangedTime
-  * 5f12b6c Merge pull request #112 from mozilla/111-improve-release-process
   * 29fa434 Improve documentation on new release process, #111
   * 25f4285 Remove old train/stage tag create scripts #111
   * eb8979b update useragent to 2.0.7 to detect IE11
   * 6140471 added bigint lockdown dependency back in
-  * 8baa716 Merge pull request #109 from mozilla/issue-107-3rd-party-cookies
-  * d37e726 Merge pull request #108 from mozilla/issue-104-password-manager
   * fd8f2dc Detect 3rd party cookies and show an error screen
   * 85f61de Make email address field read only after password manager runs. Fixes Issue #104
   * e89639b #91 old session destroyed on password change

diff --git a/scripts/create-release.sh b/scripts/create-release.sh
@@ -56,7 +56,7 @@ fi
 TMPFILE=$(mktemp /tmp/idpchangelog.XXXXX)
 echo "$TAG:" > $TMPFILE
 echo >> $TMPFILE
-git log --pretty="  * %h %s" "$LAST_RELEASE..HEAD" >> $TMPFILE
+git log --no-merges --pretty="  * %h %s" "$LAST_RELEASE..HEAD" >> $TMPFILE
 
 echo >> $TMPFILE
 cat $BASE/ChangeLog >> $TMPFILE