Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
true built-in diff: run everything in-core.
[gitweb.git]
/
git-fmt-merge-msg.perl
diff --git
a/git-fmt-merge-msg.perl
b/git-fmt-merge-msg.perl
index dae383f231f4fc4dd5482b2e091da5fe80cfa35d..afe80e6321a1495c34139ec47af7d7d6aeb239fa 100755
(executable)
--- 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, $_;
}