Applying the changes of a specific commit from one branch to another.

Applying the changes of a specific commit from one branch to another.

[NewToGit]

Applying the changes of a specific commit from one branch to another.

Scenario:

- branched off master and created story123 branch.
- made three separate change commits to story123:
	- 'fixed bug123'
	- 'fixed bug456'
	- 'fixed bug789'

- now I realized that I need to apply only one commit 'fixed bug789' to
master

Question: What's the best way to go about doing this?

Thanks for the help!

NewToGit

-- 
View this message in context: http://www.nabble.com/Applying-the-changes-of-a-specific-commit-from-one-branch-to-another.-tp22280717p22280717.html
Sent from the git mailing list archive at Nabble.com.

Re: Applying the changes of a specific commit from one branch to another.

[Chris Packham]

On Mon, Mar 2, 2009 at 2:44 PM, NewToGit <omarnetbox@gmail.com> wrote:
> Scenario:
>
> - branched off master and created story123 branch.
> - made three separate change commits to story123:
>        - 'fixed bug123'
>        - 'fixed bug456'
>        - 'fixed bug789'
>
> - now I realized that I need to apply only one commit 'fixed bug789' to
> master
>
> Question: What's the best way to go about doing this?
>

What you want to do is "cherry-pick" the commit 'fixed bug789'. With
git there are several ways to do this but the one I'd use is the
cherry-pick functionality of gitk.

git checkout master
gitk --all
<right click on the 'fixed bug789' commit and select "cherry-pick this commit">

Like I say there are plenty of ways to do something like this. I'm
sure you'll get plenty more responses.

Re: Applying the changes of a specific commit from one branch to another.

[Chris Packham]

On Mon, Mar 2, 2009 at 3:24 PM, omar-uk <omarnetbox@googlemail.com> wrote:
> Many Thanks Chris! for the quick response.
>
> What I do right click on? I tried the commit message but not getting
> any menus or anything. BTW I'm using a mac not sure if it makes a
> difference.

Hmm, Doesn't mac imply only one mouse button? Anyway whatever the
equivalent to right click is you click on the headline (also referred
to as the subject) in the tree (top half of the gitk window).

Also for mac a lot of people are using GitX which has similar
functionality to gitk (I can't claim any knowledge about it).