summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-03-09 01:56:07 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-09 02:27:15 (GMT)
commitbbe60241ae9f16c9356592e3fbaa709b6b848c4a (patch)
treed2d00eda561118f516442444dd3e16dff6669fe7 /git-fmt-merge-msg.perl
parentf067a13745fbeae1aa357876348a00e5edd0a629 (diff)
downloadgit-bbe60241ae9f16c9356592e3fbaa709b6b848c4a.zip
git-bbe60241ae9f16c9356592e3fbaa709b6b848c4a.tar.gz
git-bbe60241ae9f16c9356592e3fbaa709b6b848c4a.tar.bz2
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>
Diffstat (limited to 'git-fmt-merge-msg.perl')
-rwxr-xr-xgit-fmt-merge-msg.perl2
1 files changed, 1 insertions, 1 deletions
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, $_;
}