applying and committing patches in a single git command

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

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 [off-list ref], PGP 0x6EDDD207FCC5040F

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

On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh [off-list ref] wrote:

Erez Zilber wrote:

quoted

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

Erez Zilber wrote:

On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh [off-list ref] wrote:

quoted

Erez Zilber wrote:

quoted

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

On Tue, Jul 15, 2008 at 1:00 PM, Andreas Ericsson [off-list ref] wrote:

Erez Zilber wrote:

quoted

On Tue, Jul 15, 2008 at 11:53 AM, Boaz Harrosh [off-list ref]
wrote:

quoted

Erez Zilber wrote:

quoted

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

quoted

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.