Re: User's mailing list? And multiple cherry pick

From: David <wizzardx@gmail.com>
Date: Jun 4, 2008, 08:30 UTC
Message-ID: <18c1e6480806040130k3851a89an3fcf986feb661226@mail.gmail.com>
In-Reply-To: <m3mym1zkus.fsf@localhost.localdomain>

On Wed, Jun 4, 2008 at 10:05 AM, Jakub Narebski <jnareb@gmail.com> wrote:

> David <wizzardx@gmail.com> writes:
>
> [Please don't remove quote attributions]
>

Thanks for the netiquette tip, I didn't know this was a bad thing. Are <snip>s also a good thing, or is it ok to just cut out the parts that don't need re-quoting?

Show 9 quoted lines

>
>  # make temporary branch to not move to-be-copied during rebase
>  $ git checkout -b tmp-rebase to-be-copied
>  # copy commits; results are in just created temporary branch
>  $ git rebase --onto branch copy-from tmp-rebase
>  # check if everything is all right and rename temporary branch
>  # to final name
>  $ git branch -M tmp-rebase branch
>

Thanks :-) This still isn't what I had in mind (see my earlier post with examples), but I realise now, thanks to your post, that I can probably do it like this:

1) Make a temporary branch off the topic

2) Rebase the temporary branch onto master interactively (maybe or
maybe not with --onto), and in interactive mode take out, reorder,
etc.

3) Check & test the temporary branch

4) Merge the temporary branch into master, and drop the temporary branch.

5) Rebase the original topic branch onto the new master.

Thanks to all the posters for their tips.

David.