git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: PATCH: git-svn: support rebase --preserve-merges

From
EWEric Wong <normalperson@yhbt.net>
Date
May 16, 2012, 00:36 UTC
Message-ID
<20120516003623.GA7283@dcvr.yhbt.net>
In-Reply-To
<CAHkK2boHtwbpbfQiqWFWn3BaGfJkojVPLisaghY256m+irE3ow@mail.gmail.com>
Avishay Lavie <avishay.lavie@gmail.com> wrote:
Show 9 quoted lines
> +++ 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).

Previous: Avishay Lavie
Message 2 of 2 in “PATCH: git-svn: support rebase --preserve-merges”
  1. Avishay LavieMay 15, 2012
  2. Eric WongMay 16, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.