diff --git a/css/style.css b/css/style.css index 653062b..1baeef2 100644 --- a/css/style.css +++ b/css/style.css @@ -58,7 +58,6 @@ h3 { } p { - width: 95%; margin: 20px auto; text-shadow: 0 2px 1px #fff; color: #222438; diff --git a/index.html b/index.html index 34b7223..c2f2ff9 100644 --- a/index.html +++ b/index.html @@ -149,7 +149,7 @@
Development of new features starting from the 'develop' branch.
Start developing a new feature with
- git-flow feature start MYFEATURE + git flow feature start MYFEATURE
This action creates a new feature branch based on 'develop' and switches to it
@@ -184,7 +184,7 @@- git-flow feature finish MYFEATURE + git flow feature finish MYFEATURE
- git-flow feature publish MYFEATURE + git flow feature publish MYFEATURE
- git-flow feature pull MYFEATURE + git flow feature pull MYFEATURE
You can optionally supply a [BASE]
commit sha-1 hash to start the release from. The commit must
be on the
'develop' branch.
★ ★ ★
+It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:
++ git flow release publish RELEASE ++
(You can track a remote release with the git flow release track RELEASE
command)
git flow release finish RELEASE- -
It's wise to publish a finished release after finishing it. Do it similar to feature publishing with the - command:
-- git flow release publish RELEASE --
(You can track a remote release with the git flow release track RELEASE
command)
By finishing a hotfix it gets merged back into develp and master. Additionally the master merge ist tagged.
+By finishing a hotfix it gets merged back into develop and master. Additionally the master merge ist tagged.
++ git flow hotfix finish RELEASE +