Merge branch 'develop' into gh-pages

This commit is contained in:
Daniel Kummer
2012-11-20 10:33:39 +01:00
3 changed files with 36 additions and 18 deletions

View File

@ -81,7 +81,7 @@
<div class="scrollblock">
<h2>Setup</h2>
<h2><a href="#setup">Setup</a></h2>
<ul>
<li>You need a working git installation as prerequisite.</li>
<li>Git flow works on OSX, Linux and Windows</li>
@ -113,7 +113,7 @@
</div>
<div class="scrollblock">
<h2>Getting started</h2>
<h2><a href="#getting_started">Getting started</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
@ -139,7 +139,7 @@
<div class="scrollblock">
<h2>Features</h2>
<h2><a href="#features">Features</a></h2>
<ul class="narrow">
<li>Develop new features for upcoming releases</li>
@ -232,7 +232,7 @@
<div class="scrollblock">
<h2>Make a release</h2>
<h2><a href="#release">Make a release</a></h2>
<ul>
<li>Support preparation of a new production release</li>
@ -285,7 +285,7 @@
</div>
<div class="scrollblock">
<h2>Hotfixes</h2>
<h2><a href="#hotfixes">Hotfixes</a></h2>
<ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
@ -331,7 +331,7 @@
<div class="scrollblock">
<h2>Commands</h2>
<h2><a href="#commands">Commands</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div>
@ -354,7 +354,7 @@
<footer>
<div class="scrollblock">
<h2>Comments</h2>
<h2><a href="#comments">Comments</a></h2>
<div id="disqus_thread"></div>
</div>