diff options
| -rwxr-xr-x | utils/git2cl.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/git2cl.pl b/utils/git2cl.pl index 1c2ab3f..6a8a1e7 100755 --- a/utils/git2cl.pl +++ b/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; |