[Emacs-diffs] emacs-25 ea98cc9: * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.

[Glenn Morris]

branch: emacs-25
commit ea98cc9f49489d29f0cee08ebc3dc0f9f4abe1fd
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
---
 build-aux/gitlog-to-emacslog |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 3d61ba1..cd93ece 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