mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-29 06:11:51 +02:00
Code

git-fmt-merge-msg cleanup

Browse Source 
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>
This commit is contained in:
Linus Torvalds 2006-03-08 17:56:07 -08:00 committed by Junio C Hamano
parent f067a13745
commit bbe60241ae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-fmt-merge-msg.perl
View File

@ -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, $_;
}