Skip to content
This repository has been archived by the owner on Jun 19, 2023. It is now read-only.

Commit

Permalink
Fix readme command indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Shoozza authored and petervanderdoes committed Aug 22, 2016
1 parent 9275167 commit 4d7cbb5
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions README.mdown
Expand Up @@ -109,7 +109,7 @@ preferably in a Github fork, of course.

To initialize a new repo with the basic branch structure, use:

git flow init [-d]
git flow init [-d]

This will then interactively prompt you with some questions on which branches
you would like to use as development and production branches, and how you
Expand All @@ -124,40 +124,40 @@ The ``-d`` flag will accept all defaults.

* To list/start/finish/delete feature branches, use:

git flow feature
git flow feature start <name> [<base>]
git flow feature finish <name>
git flow feature delete <name>
git flow feature
git flow feature start <name> [<base>]
git flow feature finish <name>
git flow feature delete <name>

For feature branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.

* To push/pull a feature branch to the remote repository, use:

git flow feature publish <name>
git flow feature track <name>
git flow feature publish <name>
git flow feature track <name>

* To list/start/finish/delete release branches, use:

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

For release branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.

* To list/start/finish/delete hotfix branches, use:

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

For hotfix branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.

* To list/start support branches, use:

git flow support
git flow support start <release> <base>
git flow support
git flow support start <release> <base>

For support branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.

Expand All @@ -167,21 +167,21 @@ You can easily publish a feature you are working on. The reason can be to allow

When you want to publish a feature just use:

git flow feature publish <name>
git flow feature publish <name>

or, if you already are into the `feature/<name>` branch, just issue:

git flow feature publish
git flow feature publish

Now if you execute `git branch -avv` you will see that your branch `feature/<name>` tracks `[origin/feature/<name>]`. To track the same remote branch in another clone of the same repository use:

git flow feature track <name>
git flow feature track <name>

This will create a local feature `feature/<name>` that tracks the same remote branch as the original one, that is `origin/feature/<name>`.

When one developer (depending on your work flow) finishes working on the feature he or she can issue `git flow feature finish <name>` and this will automatically delete the remote branch. All other developers shall then run:

git flow feature delete <name>
git flow feature delete <name>

to get rid of the local feature that tracks a remote branch that no more exist.

Expand Down

0 comments on commit 4d7cbb5

Please sign in to comment.