Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff: use tempfile module
[gitweb.git]
/
git-cvsimport.perl
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index 73d367cea8f130bc7721803e397df710e7cfff58..82ecb0343a3864d1db0b066749d2087c11f689e7 100755
(executable)
--- a/
git-cvsimport.perl
+++ b/
git-cvsimport.perl
@@
-1162,7
+1162,7
@@
sub commit {
die "Fast-forward update failed: $?\n" if $?;
}
else {
- system(qw(git merge
cvsimport HEAD
), "$remote/$opt_o");
+ system(qw(git merge
-m cvsimport
), "$remote/$opt_o");
die "Could not merge $opt_o into the current branch.\n" if $?;
}
} else {