From 9524ec5e4e3c7c3036f2640b2595d3755894c1b3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 23 Mar 2016 14:49:26 -0700 Subject: 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. --- 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 bcc47b1b28..5c187f5eae 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 -- cgit v1.2.3