Git branching model

01-Creating_a_feature_branch.sh

git checkout -b myfeature develop #Switched to a new branch "myfeature"

02-Incorporating_a_finished_feature_on_develop.sh

git checkout develop #Switched to branch 'develop'
git merge --no-ff myfeature #Updating ea1b82a..05e9557 .. (Summary of changes)
git branch -d myfeature #Deleted branch myfeature (was 05e9557).
git push origin develop

03-Creating_a_release_branch.sh

git checkout -b release-1.2 develop #Switched to a new branch "release-1.2"
./bump-version.sh 1.2 #Files modified successfully, version bumped to 1.2.
git commit -a -m "Bumped version number to 1.2" #[release-1.2 74d9424] Bumped version number to 1.2 .. 1 files changed, 1 insertions(+), 1 deletions(-)

04-Finishing-a_release_branch.sh

git checkout master #Switched to branch 'master'
git merge --no-ff release-1.2 #Merge made by recursive... (Summary of changes)
git tag -a 1.2
### To keep the changes made in the release branch, we need to merge those back into develop, though
git checkout develop #Switched to branch 'develop'
git merge --no-ff release-1.2 #Merge made by recursive... (Summary of changes)
### Now we are really done and the release branch may be removed, since we don’t need it anymore:
git branch -d release-1.2 #Deleted branch release-1.2 (was ff452fe)

05-Creating_the_hotfix_branch.sh

git checkout -b hotfix-1.2.1 master #Switched to a new branch "hotfix-1.2.1"
./bump-version.sh 1.2.1 #Files modified successfully, version bumped to 1.2.1.
git commit -a -m "Bumped version number to 1.2.1" #[hotfix-1.2.1 41e61bb] Bumped version number to 1.2.1 ... 1 files changed, 1 insertions(+), 1 deletions(-)

06-Finishing_a_hotfix_branch.sh

### First, update master and tag the release.
git checkout master #Switched to branch 'master'
git merge --no-ff hotfix-1.2.1 #Merge made by recursive... (Summary of changes)
git tag -a 1.2.1
### Next, include the bugfix in develop, too:
git checkout develop #Switched to branch 'develop'
git merge --no-ff hotfix-1.2.1 #Merge made by recursive... (Summary of changes)
### Finally, remove the temporary branch:
git branch -d hotfix-1.2.1 #Deleted branch hotfix-1.2.1 (was abbe5d6).

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