Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

This patch tries to solve the following problem: #260

Open
wants to merge 2 commits into
from

Conversation

Projects
None yet
1 participant

ukautz commented Sep 26, 2012

Using git flow with multiple remotes, eg in a web development scenario. At least the master, the (current) release and the develop branch should be deployed in a different remote repositoy.

Therefore a new gitflow configuration is introduced:
[gitflow "remote"]
master = origin
release = origin
develop = origin
...

  1. Init
    The init is extended so that a remote for master, release and develop can be entered. The remotes need to be added before using "git remote add ..". Also a different branch can be chosen.

$ git clone git@my-master:repo.git
$ git remote add my-staging git@my-staging:repo.git
$ git remote add my-develop git@my-develop:repo.git
$ git flow init
Which branch should be used for bringing forth production releases?

  • master
    Branch name for production releases: [master]
    Branch name for "next release" development: [develop]

How to name your supporting branch prefixes?
Feature branches? [feature/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []

Do you use multiple remotes?
Remote for master [origin]
Remote for release [origin] my-staging:master
Remote for develop [origin] my-develop:master

  1. Features
    Also a remote (+branch) per feature can be set:

$ git flow feature start my-feature
$ git flow feature remoteset the-remote:the-branch
..

Ulrich Kautz added some commits Sep 26, 2012

Ulrich Kautz This patch tries to solve the following problem:
Using git flow with multiple remotes, eg in a web development scenario. At least the master, the (current) release and the develop branch should be deployed in a different remote repositoy.

Therefore a new gitflow configuration is introduced:
[gitflow "remote"]
master = origin
release = origin
develop = origin
...


1) Init
The init is extended so that a remote for master, release and develop can be entered. The remotes need to be added before using "git remote add ..". Also a different branch can be chosen.

$ git clone git@my-master:repo.git
$ git remote add my-staging git@my-staging:repo.git
$ git remote add my-develop git@my-develop:repo.git
$ git flow init
Which branch should be used for bringing forth production releases?
   - master
Branch name for production releases: [master] 
Branch name for "next release" development: [develop] 

How to name your supporting branch prefixes?
Feature branches? [feature/] 
Release branches? [release/] 
Hotfix branches? [hotfix/] 
Support branches? [support/] 
Version tag prefix? [] 

Do you use multiple remotes?
Remote for master [origin] 
Remote for release [origin] my-staging:master
Remote for develop [origin] my-develop:master


2) Features
Also a remote (+branch) per feature can be set:

$ git flow feature start my-feature
$ git flow feature remoteset the-remote:the-branch
..
3a69ae6
Ulrich Kautz Fix in gitflow_get_remote 362bdf9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment