I have installed a production server ocb-backports Version of Odoo 7.0 with git. Now I wonder what would be the right way to update our installation.

my clone command was (being inside of /opt/ocb)

sudo git clone --branch 7.0 https://github.com/OCA/OCB.git ocb-server  (which creates a git reposittory /opt/ocb/ocb-server).

I think I have to use 'git merge' to update my installation but would like someone more git literate than me to confirm my command is good. Actually I think it is a very similar one then the clone just replacing 'git clone' with 'git merge'

sudo git merge --branch 7.0 https://github.com/OCA/OCB.git ocb-server

Can anyone comment whether that is good or whether ther is mor to this? I am a total newb to git and I am not a programmer or anything. We are only using it to keep up to date with our production server installation. I do not intent to contribute anything from our end to the OCB branch on github (there is noting actually). I want to update my local git repository with any bugfixes or patches that where applied @ https://github.com/OCA/OCB.git

EDIT: I already have a strong feeling the above sudo git merge --branch 7.0 https://github.com/OCA/OCB.git ocb-server is not what you need to do. Still looking for the right command set. I guess it starts with moving into my repository (cd /opt/ocb/ocb-server) and executing a git status, ... then it get's a little blurry already