Re: How do I apply a single "change"

From: Luben Tuikov <ltuikov@yahoo.com>
Date: Jan 8, 2006, 00:51 UTC
Message-ID: <20060108005152.46315.qmail@web31813.mail.mud.yahoo.com>
In-Reply-To: <7v7j9b8sgf.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:

Show 9 quoted lines

> Luben Tuikov <ltuikov@yahoo.com> writes:
> 
> > ... how do I apply a single "change", identified
> > by its SHA?  Either from one branch to the other or
> > remote?
> >
> > I.e. I want to "integrate" only that change?
> 
> $ git-cherry-pick $object_name

Ok, so git searches the db (other branches, etc) and does the job. This worked for me.

How will I do this same thing but if the "change" is on a remote repository?

Show 9 quoted lines

> > Alternatively, how do I apply the absolute output of
> > "git-format-patch".  I tried but whatever I tried with
> > complained that it couldn't find any email addressess.
> > (roll eyes here)
> 
> It is unclear what you mean by absolute output, but here is what
> I regularly do:
> 
> $ git-format-patch -k -m --stdout from to | git am -3 -k

I did $ git-format-patch commit^ commit

and the usual 0001-blah-blah file got created. Then I tried to apply it, but whatever I tried it complained. Will "git-am -3 -k" work without complaining there is no "email field" or something? (I cannot try it as git-cherry-pick worked for me already.)

Thanks,
   Lunen