diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-03-08 17:56:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-08 18:27:15 -0800 |
| commit | bbe60241ae9f16c9356592e3fbaa709b6b848c4a (patch) | |
| tree | d2d00eda561118f516442444dd3e16dff6669fe7 | |
| parent | f067a13745fbeae1aa357876348a00e5edd0a629 (diff) | |
| download | git-bbe60241ae9f16c9356592e3fbaa709b6b848c4a.tar.gz git-bbe60241ae9f16c9356592e3fbaa709b6b848c4a.tar.xz | |
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>
| -rwxr-xr-x | git-fmt-merge-msg.perl | 2 |
1 files changed, 1 insertions, 1 deletions
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, $_; } |