Skip to content

Latest commit

 

History

History
114 lines (93 loc) · 3.56 KB

File metadata and controls

114 lines (93 loc) · 3.56 KB

Welcome to the Git Flow

four git stages

This tutorial uses Git-flow branching model.

gitflow

Source

Git flow Information

Install Git flow (updated fork)

https://github.com/petervanderdoes/gitflow-avh

https://github.com/petervanderdoes/gitflow-avh/wiki/Installation

try out the command in the terminal git flow version git flow

Start a normal Git Repository initialization

 mkdir git-advanced
 cd git-advanced
 git init
 touch timeline.md
 git add . && git commit -m "Initial commit" 
 vim timeline.md
 git add . && git commit -m "19th century timeline added"  

Push an existing repository from the command line

git remote add origin git@github.com:relizont/git-advanced.git
git push -u origin master

Git flow

git flow init
git flow feature start twenty-century
vim timeline.md
git add . && git commit -m "20th century timeline added"

Create new feature branch thirty-century from develop branch

git flow feature start thirty-century
vim timeline.md
git add . && git commit -m "30th century timeline added"

Finish feature branch thirty-century

git flow feature finish thirty-century

Create new feature branch forty-century from develop branch

git flow feature start forty-century
vim timeline.md
git add . && git commit -m "40th century timeline addded"
git flow feature publish forty-century
git flow feature finish forty-century

Getting a published feature forty-century

git flow feature pull origin forty-century
vim timeline.md
git add . && git commit -m "finish timeline details for forty century"
git push
git flow feature finish forty-century

Create release branch from develop using semantic versioning

git flow release start 0.1.0
git flow release publish 0.1.0
git flow release finish 0.1.0
git push origin master
git push origin develop
git push --tags

Create hotfix branch from master using semantic versioning

git flow hotfix start 0.1.1
git flow hotfix publish 0.1.1
git flow hotfix finish 0.1.1
git push origin master
git push origin develop
git push --tags

More Resources on Git Flow

Extras