Maintaining Tracking Branches

In order to keep your local repository up to date with the official, there are a few simple commands needed for any tracking branches that you may have, including master and master-1.1.x.

First, you'll need to got the latest information from the remote repo:

$ git fetch origin
		

Then for each tracking branch you have, enter the following commands:

$ git checkout master
$ git rebase origin/master
		

Alternatively, you may combine the above steps into a single command for each remote tracking branch:

$ git checkout master
$ git pull --rebase