Re: How do I apply a single "change"

Luben Tuikov [off-list ref] 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

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

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

Luben Tuikov [off-list ref] writes:

quoted

... 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?

quoted

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

Luben Tuikov wrote:

You can't. cherry-pick doesn't work on remote repos, so you need to pull 
that branch to a local one first.

quoted

quoted

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.)

You need to specify the '--mbox' (or '-m') for git-format-patch, 
otherwise it can't find author-info in the generated patch and it won't 
know who committed what.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

On Sun, 8 Jan 2006, Andreas Ericsson wrote:

You can't. cherry-pick doesn't work on remote repos, so you need to pull that
branch to a local one first.

"fetch", not "pull".

It's easy enough to get confused anyway, so we should be careful.

		Linus