git svn: stop using `rebase --preserve-merges`
We deprecated `--preserve-merges` in favor of `--rebase-merges`; Let's reflect that in `git svn`. Note: Even when the user asks for `--preserve-merges`, we now silently pass `--rebase-merges` to `git rebase` instead. Technically, this is a change of behavior. But practically, `git svn` only ever asks for a non-interactive rebase, and `--preserve-merges` and `--rebase-merges` are on par with regard to that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 22, 2019 at 22:59 UTC
ea8b7be1476a2301e3658a8e626b69c9d7f540bd
2 files changed
+7
-5
Documentation/git-svn.txt
+2
-1
@@ -677,7 +677,8 @@ config key: svn.authorsProg
677
-s<strategy>::
678
--strategy=<strategy>::
679
-p::
680
---preserve-merges::
680
+--rebase-merges::
681
+--preserve-merges (DEPRECATED)::
682
These are only used with the 'dcommit' and 'rebase' commands.
683
+
684
Passed directly to 'git rebase' when using 'dcommit' if a
git-svn.perl
+5
-4
@@ -110,7 +110,7 @@ my ($_stdin, $_help, $_edit,
110
$_template, $_shared,
111
$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
112
$_before, $_after,
113
- $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
113
+ $_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local,
114
$_prefix, $_no_checkout, $_url, $_verbose,
115
$_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);
116
@@ -270,7 +270,8 @@ my %cmd = (
270
'local|l' => \$_local,
271
'fetch-all|all' => \$_fetch_all,
272
'dry-run|n' => \$_dry_run,
273
- 'preserve-merges|p' => \$_preserve_merges,
273
+ 'rebase-merges|p' => \$_rebase_merges,
274
+ 'preserve-merges|p' => \$_rebase_merges,
275
%fc_opts } ],
276
'commit-diff' => [ \&cmd_commit_diff,
277
'Commit a diff between two trees',
@@ -1054,7 +1055,7 @@ sub cmd_dcommit {
1055
'If you are attempting to commit ',
1056
"merges, try running:\n\t",
1057
'git rebase --interactive',
1057
- '--preserve-merges ',
1058
+ '--rebase-merges ',
1059
$gs->refname,
1060
"\nBefore dcommitting";
1061
}
@@ -1717,7 +1718,7 @@ sub rebase_cmd {
1718
push @cmd, '-v' if $_verbose;
1719
push @cmd, qw/--merge/ if $_merge;
1720
push @cmd, "--strategy=$_strategy" if $_strategy;
1720
- push @cmd, "--preserve-merges" if $_preserve_merges;
1721
+ push @cmd, "--rebase-merges" if $_rebase_merges;
1722
@cmd;
1723
}
1724