diff options
Diffstat (limited to 'git-fmt-merge-msg.perl')
| -rwxr-xr-x | git-fmt-merge-msg.perl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl index f0f3100eb1..778388e254 100755 --- a/git-fmt-merge-msg.perl +++ b/git-fmt-merge-msg.perl @@ -31,6 +31,8 @@ while (<>) { my ($bname, $tname, $gname, $src); chomp; s/^[0-9a-f]* //; + next if (/^not-for-merge/); + s/^ //; if (s/ of (.*)$//) { $src = $1; } else { @@ -86,7 +88,7 @@ for my $src (@src) { $src{$src}{GENERIC}); my $this = join(', ', @this); if ($src ne '.') { - $this .= " from $src"; + $this .= " of $src"; } push @msg, $this; } |