From: Paul Eggert Date: Sun, 9 Aug 2015 23:12:11 +0000 (-0700) Subject: ChangeLog.2 ignores remote-tracking merges X-Git-Tag: emacs-25.0.90~1373^2~74 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8b9b8c063df241707143623f4a0e2d37cb2d18b;p=emacs.git ChangeLog.2 ignores remote-tracking merges * build-aux/gitlog-to-emacslog: Ignore commit logs matching "Merge remote-tracking branch '.*'" too. See Eli Zaretskii in: http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00384.html --- diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index 4fec4de2d8b..51ef2a7fc72 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$" \ + --ignore-matching="^; |^Merge branch 'master' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \ --ignore-line='^; ' --format='%B' \ "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit