git-fmt-merge-msg cleanup

Linus Torvalds· Mar 9, 2006, 01:56 UTC · lore

Since I've started using the "merge.summary" flag in my repo, my merge messages look nicer, but I dislike how I get notifications of merges within merges.

So I'd suggest this trivial change..

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
----

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index dae383f..afe80e6 100755
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -47,7 +47,7 @@ sub current_branch {
 sub shortlog {
 	my ($tip) = @_;
 	my @result;
-	foreach ( qx{git-log --topo-order --pretty=oneline $tip ^HEAD} ) {
+	foreach ( qx{git-log --no-merges --topo-order --pretty=oneline $tip ^HEAD} ) {
 		s/^[0-9a-f]{40}\s+//;
 		push @result, $_;
 	}

Junio C Hamano· Mar 9, 2006, 02:27 UTC · re: Linus Torvalds · lore

Re: git-fmt-merge-msg cleanup

Linus Torvalds <torvalds@osdl.org> writes:

Show 5 quoted lines

> Since I've started using the "merge.summary" flag in my repo, my merge 
> messages look nicer, but I dislike how I get notifications of merges 
> within merges.
>
> So I'd suggest this trivial change..

Makes sense.  Thanks.