From: Paul Eggert <eggert@penguin.cs.ucla.edu>
Date: Wed, 23 Mar 2016 21:49:26 +0000 (-0700)
Subject: Ignore more merges when generating ChangeLog
X-Git-Tag: emacs-25.0.93~89^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9524ec5;p=emacs.git

Ignore more merges when generating ChangeLog

* build-aux/gitlog-to-emacslog: Ignore all merges from gnu.org,
not merely those from master and emacs-NN.  The ChangeLog entries
they generate are not that useful.
---

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index bcc47b1b28d..5c187f5eae0 100755
--- a/build-aux/gitlog-to-emacslog
+++ b/build-aux/gitlog-to-emacslog
@@ -77,7 +77,7 @@ test -d .git || {
 # Maybe we should skip all "Merge branch 'master'" messages.
 # See eg the cairo-related ones.
 ./build-aux/gitlog-to-changelog \
-    --ignore-matching="^; |^Merge branch '(master|emacs-[0-9][0-9])' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \
+    --ignore-matching="^; |^Merge branch '[^']*' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs|^Merge remote-tracking branch '.*'$" \
   --ignore-line='^; ' --format='%B' \
   "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit