From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 9 Mar 2006 01:56:07 +0000 (-0800)
Subject: git-fmt-merge-msg cleanup
X-Git-Tag: v1.3.0-rc1~13^2~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbe60241ae9f16c9356592e3fbaa709b6b848c4a;p=git.git

git-fmt-merge-msg cleanup

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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index dae383f23..afe80e632 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, $_;
 	}