diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-06-10 21:37:06 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-06-10 21:37:06 -0400 |
| commit | 45deb048ad6d6b93082515773df2ba21006c2f42 (patch) | |
| tree | e9e3c0cb9a7f91463eac7f21b3ad3df65ebbe72b /build-aux | |
| parent | 62afb85efbaaa1e8f4c2015486e7453614027141 (diff) | |
| download | emacs-45deb048ad6d6b93082515773df2ba21006c2f42.tar.gz | |
* build-aux/gitlog-to-emacslog: Also ignore pointless merge commits.
; * ChangeLog.2: Related fixes.
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/gitlog-to-emacslog | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build-aux/gitlog-to-emacslog b/build-aux/gitlog-to-emacslog index 07b33e9aa4d..4fec4de2d8b 100755 --- a/build-aux/gitlog-to-emacslog +++ b/build-aux/gitlog-to-emacslog @@ -74,7 +74,10 @@ test -d .git || { } # Use Gnulib's packaged ChangeLog generator. -./build-aux/gitlog-to-changelog --ignore-matching='^; ' \ +# 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-line='^; ' --format='%B' \ "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit |