diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-12-14 08:46:27 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-12-14 08:46:27 -0800 |
| commit | ea98cc9f49489d29f0cee08ebc3dc0f9f4abe1fd (patch) | |
| tree | fa30351c73a4e9d184bb669c01a0b6492fb11873 /build-aux/gitlog-to-emacslog | |
| parent | ec22c3b6d6672fe05bbb42394f1cd985409cfceb (diff) | |
| download | emacs-ea98cc9f49489d29f0cee08ebc3dc0f9f4abe1fd.tar.gz | |
* build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
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 3d61ba1e389..cd93eced988 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$|^Merge remote-tracking branch '.*'$" \ + --ignore-matching="^; |^Merge branch '(master|emacs-[0-9][0-9])' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \ --ignore-line='^; ' --format='%B' \ "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit |