[Bf-committers] How Merge master changes into remote branch

[Alexander Pinzon Fernandez]

Hi

I am new user in GIT.

I read a couple of documents about GIT.

But i don't achieve merge:

I am working in branch soc-2013-sketch_mesh
in svn this worked for me

svn merge -r 60786:60972
https://svn.blender.org/svnroot/bf-blender/trunk/blender/
and i commit merge changes with this command:
svn commit -m "some text"


How i can do merge master changes into soc-2013-sketch_mesh branch, with
git???

i only can clone the branch with command at the moment
git clone -b soc-2013-sketch_mesh http://git.blender.org/blender.git

In advance thank you very much for your help

Att
Alexander Pinzon