diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-09 16:12:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-09 16:12:11 -0700 |
| commit | e8b9b8c063df241707143623f4a0e2d37cb2d18b (patch) | |
| tree | 9cbbbf16467b12e7fd2951fc91c5532ec9a7daa3 /build-aux/gitlog-to-emacslog | |
| parent | 3b112f6389edd1b55ed32cd4836a1d2cdafb524f (diff) | |
| download | emacs-e8b9b8c063df241707143623f4a0e2d37cb2d18b.tar.gz | |
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
Diffstat (limited to 'build-aux/gitlog-to-emacslog')
| -rwxr-xr-x | 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 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 |