From bbe60241ae9f16c9356592e3fbaa709b6b848c4a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Mar 2006 17:56:07 -0800 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-fmt-merge-msg.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl index dae383f2..afe80e63 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, $_; } -- 2.11.0