From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 16 May 2012 00:36:23 GMT
Subject: Re: PATCH: git-svn: support rebase --preserve-merges
Message-ID: <20120516003623.GA7283@dcvr.yhbt.net>
In-Reply-To: <CAHkK2boHtwbpbfQiqWFWn3BaGfJkojVPLisaghY256m+irE3ow@mail.gmail.com>

Avishay Lavie <avishay.lavie@gmail.com> wrote:
> +++ b/git-svn.perl
> @@ -233,6 +233,7 @@ my %cmd = (
>  			  'local|l' => \$_local,
>  			  'fetch-all|all' => \$_fetch_all,
>  			  'dry-run|n' => \$_dry_run,
> +			  'preserve-merges|p' => \$_preserve_merges
>  			  %fc_opts } ],
>  	'commit-diff' => [ \&cmd_commit_diff,
>  	                   'Commit a diff between two trees',

You're missing a comma in the above hunk, but otherwise your patch
looks trivially correct (no need to resend, I'll fix up on my end).