projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename git-config-set to git-repo-config
[git.git]
/
git-fmt-merge-msg.perl
diff --git
a/git-fmt-merge-msg.perl
b/git-fmt-merge-msg.perl
index
f0f3100
..
778388e
100755
(executable)
--- a/
git-fmt-merge-msg.perl
+++ b/
git-fmt-merge-msg.perl
@@
-31,6
+31,8
@@
while (<>) {
my ($bname, $tname, $gname, $src);
chomp;
s/^[0-9a-f]* //;
my ($bname, $tname, $gname, $src);
chomp;
s/^[0-9a-f]* //;
+ next if (/^not-for-merge/);
+ s/^ //;
if (s/ of (.*)$//) {
$src = $1;
} else {
if (s/ of (.*)$//) {
$src = $1;
} else {
@@
-86,7
+88,7
@@
for my $src (@src) {
$src{$src}{GENERIC});
my $this = join(', ', @this);
if ($src ne '.') {
$src{$src}{GENERIC});
my $this = join(', ', @this);
if ($src ne '.') {
- $this .= "
from
$src";
+ $this .= "
of
$src";
}
push @msg, $this;
}
}
push @msg, $this;
}