From e8b9b8c063df241707143623f4a0e2d37cb2d18b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 9 Aug 2015 16:12:11 -0700 Subject: [PATCH] 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 --- 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 4fec4de2d8..51ef2a7fc7 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 -- 2.39.2