Skip to content

Commit

Permalink
git-fmt-merge-msg cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Torvalds authored and Junio C Hamano committed Mar 9, 2006
1 parent f067a13 commit bbe6024
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-fmt-merge-msg.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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, $_;
}
Expand Down

0 comments on commit bbe6024

Please sign in to comment.