git-svn: drop support for --preserve-merges

dscho · dscho · commit a987e9439af6 · 2021-09-01T13:26:34.000+02:00
We already passed the `--rebase-merges` option to `git rebase` instead,
now we make this move permanent.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
@@ -678,7 +678,6 @@ config key: svn.authorsProg
 --strategy=<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
@@ -273,7 +273,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',

Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,6 @@ config key: svn.authorsProg`
`678`	`678`	`--strategy=<strategy>::`
`679`	`679`	`-p::`
`680`	`680`	`--rebase-merges::`
`681`		`---preserve-merges (DEPRECATED)::`
`682`	`681`	`These are only used with the 'dcommit' and 'rebase' commands.`
`683`	`682`	`+`
`684`	`683`	`Passed directly to 'git rebase' when using 'dcommit' if a`