diff options
| author | Paul Eggert <eggert@penguin.cs.ucla.edu> | 2016-03-23 14:49:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-23 15:08:18 -0700 |
| commit | 9524ec5e4e3c7c3036f2640b2595d3755894c1b3 (patch) | |
| tree | 50c755c8e77093e1429766a2a45e4bc229e915ad /build-aux/gitlog-to-emacslog | |
| parent | ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520 (diff) | |
| download | emacs-9524ec5e4e3c7c3036f2640b2595d3755894c1b3.tar.gz | |
Ignore more merges when generating ChangeLog
* build-aux/gitlog-to-emacslog: Ignore all merges from gnu.org,
not merely those from master and emacs-NN. The ChangeLog entries
they generate are not that useful.
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 bcc47b1b28d..5c187f5eae0 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|emacs-[0-9][0-9])' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs$|^Merge remote-tracking branch '.*'$" \ + --ignore-matching="^; |^Merge branch '[^']*' of git\.(savannah|sv)\.gnu\.org:/srv/git/emacs|^Merge remote-tracking branch '.*'$" \ --ignore-line='^; ' --format='%B' \ "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit |