mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/git-svn-use-rebase-merges'

Browse Source 
Prepare further for "rebase --preserve-merges" deprecation.

* js/git-svn-use-rebase-merges:
  git svn: stop using `rebase --preserve-merges`
This commit is contained in:
Junio C Hamano
2019-12-05 12:52:46 -08:00
parent f06dff7b7c ea8b7be147
commit 75bd003c7b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-svn.txt
View File

@ -677,7 +677,8 @@ config key: svn.authorsProg
-s<strategy>:: -s<strategy>::
--strategy=<strategy>:: --strategy=<strategy>::
-p:: -p::
--preserve-merges:: --rebase-merges::
--preserve-merges (DEPRECATED)::
These are only used with the 'dcommit' and 'rebase' commands. These are only used with the 'dcommit' and 'rebase' commands.
+ +
Passed directly to 'git rebase' when using 'dcommit' if a Passed directly to 'git rebase' when using 'dcommit' if a

9
git-svn.perl
View File

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