From ea98cc9f49489d29f0cee08ebc3dc0f9f4abe1fd Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 14 Dec 2015 08:46:27 -0800 Subject: [PATCH] * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits. --- build-aux/gitlog-to-emacslog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.2