Posted by: terryhowe | January 28, 2013

Github Cherry Pick Merge with git cherry-pick

Say you had an important fix on your develop branch that needed to merged to master, but you did not want to merge everything.  They way to get the change to master is a cherry-pick merge.  If you look at the commit in github:

One commint into git

One commint into git

All you need is the commit number there and you run the cherry pick command:


git checkout master
git cherry-pick 4a2108c414
[master 18faa81] update to 1.6.0
1 file changed, 4 insertions(+), 4 deletions(-)
git push origin master

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

Categories

%d bloggers like this: