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

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

Show 8 quoted lines

> There is Git User's mailing list ("Git for human beings", heh)
>  git-users@googlegroups.com
>  http://groups.google.com/group/git-users
>  nntp://news.gmane.org/gmane.comp.version-control.git.user
>
> There is GitFaq at Git Wiki:
>  http://git.or.cz/gitwiki/GitFaq
>

Thanks for the links.

Show 7 quoted lines

>> Is there an easier syntax for doing this?
>
>  $ git rebase --onto
>  $ git rebase --onto --interactive
>
> (if you want to copy, just create new branch using "git branch", or
> something).

Thanks, but this doesn't quite solve the problem. I'm on the verge of figuring it out, and would appreciate any further tips :-)

Here is an example:

o--o--O master
       \
        o--o--X--X--X--X--o--o topic

I want to copy the "X" patches from the topic branch over to master. The other patches aren't appropriate for master for whatever reason. eg, temporary debugging hacks, but I fixed a few problems in master in the X patches and now want to apply them on top of master, and keep working on "topic"

I want to end up with a tree like this:

o--o--O--X'--X'--X'--X' master
       \
        o--o--X--X--X--X--o--o topic

After getting the branches like this, I would then (try to) rebase topic like this:

o--o--O--X'--X'--X'--X' master
                      \
                       o'--o'--o'--o' topic

I say try to, because rebase sometimes gets a lot of dumb (to me, maybe I'm not using git correctly) conflicts in cases like this, so I end up manually rebasing, by making a new topic branch off master, cherry picking into it off the old topic branch, and then removing the old branch. Another case where multiple cherry picks would be nice :-)

>
> Why can't you simply use merge, BTW?

Because the topic branch has some 'dirty' commits that I don't want in master.

David.