From: Andreas Ericsson <ae@op5.se>
To: ltuikov@yahoo.com
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: How do I apply a single "change"
Date: Sun, 08 Jan 2006 02:19:14 +0100 [thread overview]
Message-ID: <43C06892.2030709@op5.se> (raw)
In-Reply-To: <20060108005152.46315.qmail@web31813.mail.mud.yahoo.com>
Luben Tuikov wrote:
> --- Junio C Hamano <junkio@cox.net> wrote:
>>
>>$ 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?
>
You can't. cherry-pick doesn't work on remote repos, so you need to pull
that branch to a local one first.
>
>>>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
next prev parent reply other threads:[~2006-01-08 1:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-08 0:31 How do I apply a single "change" Luben Tuikov
2006-01-08 0:38 ` Junio C Hamano
2006-01-08 0:51 ` Luben Tuikov
2006-01-08 1:19 ` Andreas Ericsson [this message]
2006-01-08 2:24 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43C06892.2030709@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=ltuikov@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.