Johannes Schindelin via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote:
> We already passed the `--rebase-merges` option to `git rebase` instead,
> now we make this move permanent.
> diff --git a/git-svn.perl b/git-svn.perl
> index 4aa208ff5f..f1fa1bc7f7 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -271,7 +271,6 @@ sub _req_svn {
> 'fetch-all|all' => \$_fetch_all,
> 'dry-run|n' => \$_dry_run,
> 'rebase-merges|p' => \$_rebase_merges,
> - 'preserve-merges|p' => \$_rebase_merges,
> %fc_opts } ],
> 'commit-diff' => [ \&cmd_commit_diff,
> 'Commit a diff between two trees',
Nack, it breaks existing usages. Why the urgency with removal?
I don't know a whole lot about this rebase feature in
particular, but deprecation periods should be measured in years
or even decades because of LTS distros. Not months, especially
for things which have been around for a long while.
