Am Dienstag, den 23.08.2011, 19:48 -0400 schrieb James Cloos:
> >>>>> "RD" == Robert Dodier <robert.dodier at gmail.com> writes:
>
> RD> That said, it would still be useful to know how to merge
> RD> a patch from master onto a branch. I don't know how
> RD> to do that.
>
> I have no idea how to do it in eclipse, but at the cli git cherry-pick
> is the typical magic.
>
> After a typical clone (which creates a local master branch tracking the
> upstream master branch), run:
>
> :; git checkout -t remotes/origin/branch-5_25
>
> to create a local branch-5_25 branch tracking the upstream branch-5_25
> branch.
>
> Then, you can use git cherry-pick to grab the commit(s) from master.
>
> You'll want to know the commit id. You can use
>
> :; git log master
>
> to look at master's history, even when another branch is checked-out.
>
> If, as an example, you wanted to cherry-pick the "Paste in info about
> 5.25 changes." commit, 124f7c2f4aaf, you could then run:
>
> :; git cherry-pick 124f7c2f4aaf
>
> and that commit will have been added to your local tracking branch.
>
> :; git push
>
> should then push that upstream. And
>
> :; git checkout master
>
> gets your repo back to master.
>
> Now that you have a local branch tracking branch-5_25, you just need:
>
> :; git checkout branch-5_25
>
> to get back to it.
>
> Cherry-pick has several options. Either of:
>
> :; git help cherry-pick
> :; man git-cherry-pick
>
> will show the man page.
Thank you very much for your help.
It worked. I have done a cherry-pick and I have committed the change to
branch-5.25. I have not committed the additional testsuite examples. But
the examples work as expected.
Dieter Kaiser