Skip to content

Instantly share code, notes, and snippets.

@agrakhov

agrakhov/gitflow-breakdown.md

Forked from JamesMGreene/gitflow-breakdown.md
Last active April 14, 2017 21:58
Show Gist options
  • Save agrakhov/21be9890f4d413421418ece4dcd81b87 to your computer and use it in GitHub Desktop.
Save agrakhov/21be9890f4d413421418ece4dcd81b87 to your computer and use it in GitHub Desktop.
Download ZIP
A comparison of using `git flow` commands versus raw `git` commands.
Raw
gitflow-breakdown.md

Edit .gitignore

https://github.com/github/gitignore

To remove ignored files:

  1. Update your .gitignore
  2. git rm -r --cached .
  3. git add .

Initialize

gitflow git
git flow init git init
(optional for CRLF warning) git config --global core.safecrlf false
(optional) git add .
git commit --allow-empty -m "Initial commit"
git checkout -b develop master

Connect to the remote repository

gitflow git
N/A git remote add origin [email protected]:MYACCOUNT/MYREPO
Note: if ssh -T [email protected] is not working:

Push to the remote repository

gitflow git
N/A git checkout master
git push origin master
git checkout develop
git push origin develop

Migrate existing project to new repo:

  • cd existing_repo
  • git remote add origin [email protected]:eproqure/test.git
  • git push -u origin --all
  • git push -u origin --tags

Features

Create a feature branch

gitflow git
git flow feature start MYFEATURE git checkout -b feature/MYFEATURE develop

Share a feature branch

gitflow git
git flow feature publish MYFEATURE git checkout feature/MYFEATURE
git push origin feature/MYFEATURE

Get latest for a feature branch

gitflow git
git flow feature pull origin MYFEATURE git checkout feature/MYFEATURE
git pull --rebase origin feature/MYFEATURE

Finalize a feature branch

gitflow git
git flow feature finish MYFEATURE git checkout develop
git merge --no-ff feature/MYFEATURE
git branch -d feature/MYFEATURE
to del remote git push origin --delete feature/MYFEATURE

Push the merged feature branch

gitflow git
N/A git push origin develop
git push origin :feature/MYFEATURE (if pushed)

Releases

Create a release branch

gitflow git
git flow release start 1.2.0 git checkout -b release/1.2.0 develop

Share a release branch

gitflow git
git flow release publish 1.2.0 git checkout release/1.2.0
git push origin release/1.2.0

Get latest for a release branch

gitflow git
N/A git checkout release/1.2.0
git pull --rebase origin release/1.2.0

Finalize a release branch

gitflow git
git flow release finish 1.2.0 git checkout master
git merge --no-ff release/1.2.0
git tag -a 1.2.0
git checkout develop
git merge --no-ff release/1.2.0
git branch -d release/1.2.0

Push the merged feature branch

gitflow git
N/A git push origin master
git push origin develop
git push origin --tags
git push origin :release/1.2.0 (if pushed)

Hotfixes

Create a hotfix branch

gitflow git
git flow hotfix start 1.2.1 [commit] git checkout -b hotfix/1.2.1 [commit]

Finalize a hotfix branch

gitflow git
git flow hotfix finish 1.2.1 git checkout master
git merge --no-ff hotfix/1.2.1
git tag -a 1.2.1
git checkout develop
git merge --no-ff hotfix/1.2.1
git branch -d hotfix/1.2.1

Push the merged hotfix branch

gitflow git
N/A git push origin master
git push origin develop
git push origin --tags
git push origin :hotfix/1.2.1 (if pushed)

References

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment