跳到主要内容

gitflow

  • petervanderdoes/gitflow-avh
    • 2019 停止维护
    • a collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model.
    • adds more functionality to the existing git-flow and several of the internal commands have been rewritten to speed up the software.
  • nvie/gitflow
    • 2012 停止维护
  • A successful Git branching model
  • git-flow 工作流程
  • branches
    • bugfix hotfix release feature support
  • actions
    • delete finish list publish rename start track
    • rebase
brew install git-flow-avh

git flow init -d
git push --set-upstream origin develop

git checkout develop
git flow release start v2021.1.1
git flow release finish v2021.1.1
git push --tags

standard

  • 单分支 - GitHub flow
    • master
  • 功能分支
    • master, feature/*
    • feature/* -> master
  • gitflow
    • master, develop, feature/*, release/*,hotfix/*
    • release/*, hotfix/* -> master
    • feature/*, release/*, hotfix/* -> develop
  • GitLab
    • master, feature/*, *-stable, env/*
    • feature/* -> master