[KLS]

Was waiting on merging it cause demon had raised some concerns but in the meantime branching is your friend

Creating a branch with name "some_feature_branch_name"

git checkout -b some_feature_branch_name

To move back to master

git checkout master

To switch back to branch and merge changes from master you just got

git checkout some_feature_branch_name

To say merge code from master after you've updated it

git merge master

You can setup pull requests to use your own named branches instead of master.

Also: http://git-scm.com/book/en/Git-Branc...ng-and-Merging