Re: My first push

[Johannes Schindelin]

Hi,

On Tue, 8 Apr 2008, Reinhold Kainhofer wrote:

> There is something called "cherry-picking" in git, but I haven't 
> looked into that too much.

It's pretty easy, really.  You just switch to the branch that does not 
have the patch, then find a name for the commit you want to cherry-pick 
(something like my-work~2 or the whole commit SHA-1 that you see in gitk 
or git log), and then you apply it together with the commit message and 
author information by

        $ git cherry-pick <commit name>

The difference to the format-patch mantra is that cherry-pick copes pretty 
well with renames, and it does a threeway merge.

Ciao,
Dscho