diff options
Diffstat (limited to 'third_party/git/git-svn.perl')
| -rwxr-xr-x | third_party/git/git-svn.perl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/git/git-svn.perl b/third_party/git/git-svn.perl index 4aa208ff5f..050f2a36f4 100755 --- a/third_party/git/git-svn.perl +++ b/third_party/git/git-svn.perl @@ -110,7 +110,7 @@ my ($_stdin, $_help, $_edit, $_template, $_shared, $_version, $_fetch_all, $_no_rebase, $_fetch_parent, $_before, $_after, - $_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local, + $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); @@ -270,8 +270,7 @@ my %cmd = ( 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, 'dry-run|n' => \$_dry_run, - 'rebase-merges|p' => \$_rebase_merges, - 'preserve-merges|p' => \$_rebase_merges, + 'preserve-merges|p' => \$_preserve_merges, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', @@ -1055,7 +1054,7 @@ sub cmd_dcommit { 'If you are attempting to commit ', "merges, try running:\n\t", 'git rebase --interactive', - '--rebase-merges ', + '--preserve-merges ', $gs->refname, "\nBefore dcommitting"; } @@ -1718,7 +1717,7 @@ sub rebase_cmd { push @cmd, '-v' if $_verbose; push @cmd, qw/--merge/ if $_merge; push @cmd, "--strategy=$_strategy" if $_strategy; - push @cmd, "--rebase-merges" if $_rebase_merges; + push @cmd, "--preserve-merges" if $_preserve_merges; @cmd; } |