From: Johannes Schindelin via GitGitGadget Date: Sat, 23 Nov 2019 20:50:40 GMT Subject: [PATCH 6/8] git-svn: drop support for `--preserve-merges` Message-ID: In-Reply-To: From: Johannes Schindelin We already passed the `--rebase-merges` option to `git rebase` instead, now we make this move permanent. Signed-off-by: Johannes Schindelin --- Documentation/git-svn.txt | 1 - git-svn.perl | 1 - 2 files changed, 2 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 6624a14fbd..6cfd48c9d3 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -678,7 +678,6 @@ config key: svn.authorsProg --strategy=:: -p:: --rebase-merges:: ---preserve-merges (DEPRECATED):: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a 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', -- gitgitgadget