* applying and committing patches in a single git command
@ 2008-07-15 8:50 Erez Zilber
2008-07-15 8:52 ` Stephan Beyer
2008-07-15 8:53 ` Boaz Harrosh
0 siblings, 2 replies; 6+ messages in thread
From: Erez Zilber @ 2008-07-15 8:50 UTC (permalink / raw)
To: git@vger.kernel.org
Hi,
Someone created a patch with git-format-patch and sent it to me. I
would like to apply & commit the patch. If I use git-apply, it only
patches my tree without committing it. Now, I need to copy the commit
log, run git-commit and paste the commit log there. Is there a more
intelligent way to do that?
Thanks,
Erez
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: applying and committing patches in a single git command
2008-07-15 8:50 applying and committing patches in a single git command Erez Zilber
@ 2008-07-15 8:52 ` Stephan Beyer
2008-07-15 8:53 ` Boaz Harrosh
1 sibling, 0 replies; 6+ messages in thread
From: Stephan Beyer @ 2008-07-15 8:52 UTC (permalink / raw)
To: Erez Zilber; +Cc: git@vger.kernel.org
Hi,
Erez Zilber wrote:
> Hi,
>
> Someone created a patch with git-format-patch and sent it to me. I
> would like to apply & commit the patch. If I use git-apply, it only
> patches my tree without committing it. Now, I need to copy the commit
> log, run git-commit and paste the commit log there. Is there a more
> intelligent way to do that?
git-am is exactly what you want.
Regards.
--
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: applying and committing patches in a single git command
2008-07-15 8:50 applying and committing patches in a single git command Erez Zilber
2008-07-15 8:52 ` Stephan Beyer
@ 2008-07-15 8:53 ` Boaz Harrosh
2008-07-15 9:46 ` Erez Zilber
1 sibling, 1 reply; 6+ messages in thread
From: Boaz Harrosh @ 2008-07-15 8:53 UTC (permalink / raw)
To: Erez Zilber; +Cc: git@vger.kernel.org
Erez Zilber wrote:
> Hi,
>
> Someone created a patch with git-format-patch and sent it to me. I
> would like to apply & commit the patch. If I use git-apply, it only
> patches my tree without committing it. Now, I need to copy the commit
> log, run git-commit and paste the commit log there. Is there a more
> intelligent way to do that?
>
> Thanks,
> Erez
>
git-am, can take all bunch of them at once
Boaz
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: applying and committing patches in a single git command
2008-07-15 8:53 ` Boaz Harrosh
@ 2008-07-15 9:46 ` Erez Zilber
2008-07-15 10:00 ` Andreas Ericsson
0 siblings, 1 reply; 6+ messages in thread
From: Erez Zilber @ 2008-07-15 9:46 UTC (permalink / raw)
To: Boaz Harrosh, s-beyer; +Cc: git@vger.kernel.org
On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh <bharrosh@panasas.com> wrote:
> Erez Zilber wrote:
>> Hi,
>>
>> Someone created a patch with git-format-patch and sent it to me. I
>> would like to apply & commit the patch. If I use git-apply, it only
>> patches my tree without committing it. Now, I need to copy the commit
>> log, run git-commit and paste the commit log there. Is there a more
>> intelligent way to do that?
>>
>> Thanks,
>> Erez
>>
> git-am, can take all bunch of them at once
>
> Boaz
>
Thanks. I have 2 more questions:
1. How can I tell git-am to take a patch from an e-mail from a gmail account?
2. If I have the actual patch on my machine (not in an e-mail
message), I guess that I need something else (not git-am). Is there
anything like that?
Thanks,
Erez
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: applying and committing patches in a single git command
2008-07-15 9:46 ` Erez Zilber
@ 2008-07-15 10:00 ` Andreas Ericsson
2008-07-15 11:03 ` Erez Zilber
0 siblings, 1 reply; 6+ messages in thread
From: Andreas Ericsson @ 2008-07-15 10:00 UTC (permalink / raw)
To: Erez Zilber; +Cc: Boaz Harrosh, s-beyer, git@vger.kernel.org
Erez Zilber wrote:
> On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh <bharrosh@panasas.com> wrote:
>> Erez Zilber wrote:
>>> Hi,
>>>
>>> Someone created a patch with git-format-patch and sent it to me. I
>>> would like to apply & commit the patch. If I use git-apply, it only
>>> patches my tree without committing it. Now, I need to copy the commit
>>> log, run git-commit and paste the commit log there. Is there a more
>>> intelligent way to do that?
>>>
>>> Thanks,
>>> Erez
>>>
>> git-am, can take all bunch of them at once
>>
>> Boaz
>>
>
> Thanks. I have 2 more questions:
> 1. How can I tell git-am to take a patch from an e-mail from a gmail account?
You can't, but you can save your gmail message to disc and pass
the saved file to "git am" (don't use "git-am" over "git am";
we're trying to get away from that old format of typing).
> 2. If I have the actual patch on my machine (not in an e-mail
> message), I guess that I need something else (not git-am). Is there
> anything like that?
>
git apply patchfile
patch (-p1) < patchfile
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: applying and committing patches in a single git command
2008-07-15 10:00 ` Andreas Ericsson
@ 2008-07-15 11:03 ` Erez Zilber
0 siblings, 0 replies; 6+ messages in thread
From: Erez Zilber @ 2008-07-15 11:03 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: Boaz Harrosh, s-beyer, git@vger.kernel.org
On Tue, Jul 15, 2008 at 1:00 PM, Andreas Ericsson <ae@op5.se> wrote:
> Erez Zilber wrote:
>>
>> On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh <bharrosh@panasas.com>
>> wrote:
>>>
>>> Erez Zilber wrote:
>>>>
>>>> Hi,
>>>>
>>>> Someone created a patch with git-format-patch and sent it to me. I
>>>> would like to apply & commit the patch. If I use git-apply, it only
>>>> patches my tree without committing it. Now, I need to copy the commit
>>>> log, run git-commit and paste the commit log there. Is there a more
>>>> intelligent way to do that?
>>>>
>>>> Thanks,
>>>> Erez
>>>>
>>> git-am, can take all bunch of them at once
>>>
>>> Boaz
>>>
>>
>> Thanks. I have 2 more questions:
>> 1. How can I tell git-am to take a patch from an e-mail from a gmail
>> account?
>
> You can't, but you can save your gmail message to disc and pass
> the saved file to "git am" (don't use "git-am" over "git am";
> we're trying to get away from that old format of typing).
>
>> 2. If I have the actual patch on my machine (not in an e-mail
>> message), I guess that I need something else (not git-am). Is there
>> anything like that?
>>
>
> git apply patchfile
> patch (-p1) < patchfile
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-07-15 11:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-15 8:50 applying and committing patches in a single git command Erez Zilber
2008-07-15 8:52 ` Stephan Beyer
2008-07-15 8:53 ` Boaz Harrosh
2008-07-15 9:46 ` Erez Zilber
2008-07-15 10:00 ` Andreas Ericsson
2008-07-15 11:03 ` Erez Zilber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).