diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-10-01 20:06:25 +0400 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2011-10-01 20:06:25 +0400 |
commit | ccd95be4b1635ff75fba947d8a37c045c98354b2 (patch) | |
tree | b2d499b4e873049d2d226b0daa05bb9fa60774ad /scripts/git2cl.pl | |
parent | 6a4603001584634a3b168f3809fb57c268128bce (diff) |
Strip merge pull request from changelog (oh, and update the changelog)
Diffstat (limited to 'scripts/git2cl.pl')
-rw-r--r-- | scripts/git2cl.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/git2cl.pl b/scripts/git2cl.pl index c4b66b6fc..f8e04d0a6 100644 --- a/scripts/git2cl.pl +++ b/scripts/git2cl.pl @@ -37,6 +37,7 @@ while(<LOG>) { next if ($subject =~ /^\*\*\* empty log message/); next if ($subject =~ /^git-svn-id: http/); next if ($subject =~ /^TEST/); + next if ($subject =~ /^Merge pull request/); next if ($subject eq $lsub); $lsub = $subject; my $entry = wrap(" $hash ", " ", $subject); |