]> git.eshelyaron.com Git - emacs.git/commitdiff
ChangeLog.2 ignores remote-tracking merges
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 9 Aug 2015 23:12:11 +0000 (16:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 9 Aug 2015 23:12:11 +0000 (16:12 -0700)
* 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

index 4fec4de2d8b2702a9d2b7088c706688c78531c21..51ef2a7fc7287941737b42bfff654bd617b2fef7 100755 (executable)
@@ -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