diff options
Diffstat (limited to 'git-cvsimport-script')
| -rwxr-xr-x | git-cvsimport-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script index 1f36acea22..e3a8e584a5 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -579,7 +579,7 @@ my $commit = sub { foreach my $rx (@mergerx) { if ($logmsg =~ $rx) { my $mparent = $1; - if ($mparent eq 'HEAD') { $mparent = 'origin'}; + if ($mparent eq 'HEAD') { $mparent = $opt_o }; if ( -e "$git_dir/refs/heads/$mparent") { $mparent = get_headref($mparent, $git_dir); push @par, '-p', $mparent; |