Successful Git branching model

git-branching-model.txt

// Development branch
git branch develop

// Development branch supporting branches
git branch feature-* // may branch off from develop, must merge back to develop
git branch release-* // may branch off from develop, must merge back to develop or master
git branch hotfix-*  // branch off from master, must merge back to master and develop

// Merging branch that will retain branching history and metadata
git merge --no-ff branchname

// Tagging release after merging a branch to master, ie: 1.2.1
git tag -a <major>.<minor>.<patch>

// Reference: http://nvie.com/posts/a-successful-git-branching-model/