projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
0d27c3f
)
Merge branch 'jc/merge-msg' into next
author
Junio C Hamano
<junkio@cox.net>
Mon, 20 Feb 2006 05:17:06 +0000
(21:17 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 20 Feb 2006 05:17:06 +0000
(21:17 -0800)
* jc/merge-msg:
fmt-merge-msg: do not add excess newline at the end.
git-fmt-merge-msg.perl
patch
|
blob
|
history
diff --git
a/git-fmt-merge-msg.perl
b/git-fmt-merge-msg.perl
index
616bb52
..
c34ddc5
100755
(executable)
--- a/
git-fmt-merge-msg.perl
+++ b/
git-fmt-merge-msg.perl
@@
-43,6
+43,7
@@
sub current_branch {
my $fh;
open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
my ($bra) = <$fh>;
+ chomp($bra);
$bra =~ s|^refs/heads/||;
if ($bra ne 'master') {
$bra = " into $bra";