[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master e8b9b8c: ChangeLog.2 ignores remote-tracking merges
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master e8b9b8c: ChangeLog.2 ignores remote-tracking merges |
Date: |
Sun, 09 Aug 2015 23:12:17 +0000 |
branch: master
commit e8b9b8c063df241707143623f4a0e2d37cb2d18b
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog
index 4fec4de..51ef2a7 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master e8b9b8c: ChangeLog.2 ignores remote-tracking merges,
Paul Eggert <=