X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=8253cb7a17aec5cdfa9e964e7b705b808a5747f2;hb=65025cb45c2739135ac4161a99d15e6555a9a794;hp=aacad91771bdd88746b08b68236522039be276bf;hpb=c0781c85a246169edbe7154d2f0073649af82709;p=dgit.git diff --git a/git-debrebase b/git-debrebase index aacad917..8253cb7a 100755 --- a/git-debrebase +++ b/git-debrebase @@ -757,7 +757,7 @@ sub walk ($;$$) { my $newtree = cmdoutput @git, qw(write-tree); my $ch = $cl->{Hdr}; $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?"; - $ch =~ s{^parent .*\n}{}m; + $ch =~ s{^parent .*\n}{}mg; $ch =~ s{(?=^author)}{ join '', map { "parent $_\n" } @parents }me or confess "$ch ?";