X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-fmt-merge-msg.perl;h=778388e254e8ecc07494c168aec503e3bc511fb3;hb=23d61f8343282643c830e1c446962b213dbcc09a;hp=f0f3100eb1c089efd990b71bb747f4dd0cd035f9;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index f0f3100e..778388e2 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;
 }