Browse Source

Fix skipping of merge commits in log convert script.

pull/1/head
Christian Beier 11 years ago
parent
commit
8a2183b2d9
  1. 3
      utils/git2cl.pl

3
utils/git2cl.pl

@ -321,9 +321,10 @@ while (my $_l = <$fh>) {
# Luis Mondesi <lemsx1@gmail.com>
my $_s = $_l;
$_s =~ s/^ //g;
if ($_s =~ m/^Merge branch/)
if ($_s =~ m/^Merge branch|^Merge remote branch/)
{
$state=0;
$author=0;
next;
}
$comment = $comment . $_s;

Loading…
Cancel
Save