From: Glenn Morris <rgm@gnu.org>
Date: Mon, 14 Dec 2015 16:46:27 +0000 (-0800)
Subject: * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
X-Git-Tag: emacs-25.0.90~472
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/ea98cc9f49489d29f0cee08ebc3dc0f9f4abe1fd

* build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
---

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 3d61ba1e38..cd93eced98 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' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \
+    --ignore-matching="^; |^Merge branch '(master|emacs-[0-9][0-9])' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \
   --ignore-line='^; ' --format='%B' \
   "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit