GIT 开发流程新人学习指南

feature/分支名称

bugfix/分支名称
hotfix/分支名称

release/分支名称

$ git flow init
 
Which branch should be used for bringing forth production releases?
    - develop
    - feature-fulltext
    - feature-vender
    - master
Branch name for production releases: [master]
 
Which branch should be used for integration of the "next release"?
    - develop
    - feature-fulltext
    - feature-vender
Branch name for "next release" development: [develop]
 
How to name your supporting branch prefixes?
Feature branches? [feature/]
Bugfix branches? [bugfix/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []
Hooks and filters directory? [/Users/mylxsw/codes/work/e-business-3.0/.git/hooks]

git flow feature
git flow feature start <name>
git flow feature finish <name>
git flow feature delete <name>
 
git flow feature publish <name>
git flow feature track <name>

$ git flow feature start material-add
Switched to a new branch 'feature/material-add'
 
Summary of actions:
- A new branch 'feature/material-add' was created, based on 'develop'
- You are now on branch 'feature/material-add'
 
Now, start committing on your feature. When done, use:
 
        git flow feature finish material-add
 
$ git status
On branch feature/material-add
nothing to commit, working directory clean
$ git flow feature publish
Total 0 (delta 0), reused 0 (delta 0)
To http://dev.oss.yunsom.cn:801/yunsom/e-business-3.0.git
    * [new branch]      feature/material-add -> feature/material-add
Branch feature/material-add set up to track remote branch feature/material-add from origin.
Already on 'feature/material-add'
Your branch is up-to-date with 'origin/feature/material-add'.
 
Summary of actions:
- The remote branch 'feature/material-add' was created or updated
- The local branch 'feature/material-add' was configured to track the remote branch
- You are now on branch 'feature/material-add'
 
$ vim README.md
$ git add --all
$ git commit -m "modify readme file "
[feature/material-add 7235bd4] modify readme file
    1 file changed, 1 insertion(+), 2 deletions(-)
$ git push
Counting objects: 3, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 303 bytes | 0 bytes/s, done.
Total 3 (delta 2), reused 0 (delta 0)
To http://dev.oss.yunsom.cn:801/yunsom/e-business-3.0.git
    0d4fb8f..7235bd4  feature/material-add -> feature/material-add
$ git flow feature finish
Switched to branch 'develop'
Your branch is up-to-date with 'origin/develop'.
Updating 0d4fb8f..7235bd4
Fast-forward
    README.md | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)
To http://dev.oss.yunsom.cn:801/yunsom/e-business-3.0.git
    - [deleted]         feature/material-add
Deleted branch feature/material-add (was 7235bd4).
 
Summary of actions:
- The feature branch 'feature/material-add' was merged into 'develop'
- Feature branch 'feature/material-add' has been locally deleted; it has been remotely deleted from 'origin'
- You are now on branch 'develop'
 
$ git branch
* develop
    feature-fulltext
    feature-vender
    master

git flow release
git flow release start <release> [<base>]
git flow release finish <release>
git flow release delete <release>

git flow hotfix
git flow hotfix start <release> [<base>]
git flow hotfix finish <release>
git flow hotfix delete <release>