mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2025-03-11 05:29:20 +01:00
smaller version (print optimized width)
This commit is contained in:
Daniel
parent
72603e6cc7
commit
7c748fadb6
274
css/print.css
274
css/print.css
@ -1,274 +0,0 @@
|
||||
/*---------------------------------------- Text */
|
||||
|
||||
body {
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 30px;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
header {
|
||||
height: 400px;
|
||||
border-bottom: 1px solid #698b91
|
||||
}
|
||||
|
||||
footer {
|
||||
display: none;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 120px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 80px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 40px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
p {
|
||||
width: 95%;
|
||||
margin: 20px auto;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
margin-left: 0;
|
||||
padding-left: 1em;
|
||||
text-indent: -1em;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
ul li:before {
|
||||
content: "\2605\a0"
|
||||
}
|
||||
|
||||
/** coding block */
|
||||
blockquote {
|
||||
text-align: left;
|
||||
margin: 10px auto;
|
||||
background: #131420;
|
||||
border-bottom: 2px solid #30334F;
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
|
||||
}
|
||||
|
||||
code {
|
||||
font-style: normal;
|
||||
padding-left: 5px;
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
font-family: menlo, monospace;
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Images */
|
||||
|
||||
.initialize {
|
||||
background: url("../img/initialize.png") no-repeat scroll center center transparent;
|
||||
height: 300px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.lines-small {
|
||||
width: 500px;
|
||||
height: 150px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.lines-small-end {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-small.png");
|
||||
position: absolute;
|
||||
|
||||
}
|
||||
|
||||
.lines-big {
|
||||
width: 500px;
|
||||
height: 5620px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
left: 697px;
|
||||
|
||||
}
|
||||
|
||||
.lines-open {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-open.png");
|
||||
}
|
||||
|
||||
.lines-close {
|
||||
width: 500px;
|
||||
height: 86px;
|
||||
background: url("../img/lines-close.png");
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
background-image: url('../img/flow-sprites.png');
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
.feature-publish {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
|
||||
background-image: url('../img/feature-publish.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.feature-pull {
|
||||
display: inline-block;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
background-color: rgba(218, 218, 218, 0.78);
|
||||
border: 2px dashed grey;
|
||||
border-radius: 25px;
|
||||
width: 500px;
|
||||
height: 370px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
|
||||
background-image: url('../img/feature-pull.png');
|
||||
background-position: center;
|
||||
|
||||
}
|
||||
|
||||
.hotfix-end {
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.hotfix-start {
|
||||
background-position: 0px -370px;
|
||||
}
|
||||
|
||||
.release-end {
|
||||
background-position: 0px -740px;
|
||||
}
|
||||
|
||||
.release-start {
|
||||
background-position: 0px -1110px;
|
||||
}
|
||||
|
||||
.feature-end {
|
||||
background-position: 0px -1480px;
|
||||
}
|
||||
|
||||
.feature-start {
|
||||
background-position: 0px -1850px;
|
||||
}
|
||||
|
||||
/*---------------------------------------- BLOCKS */
|
||||
|
||||
.col-1 {
|
||||
float: left;
|
||||
width: 600px;
|
||||
}
|
||||
|
||||
.col-2 {
|
||||
float: right;
|
||||
width: 500px;
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#main {
|
||||
margin: 0 auto;
|
||||
position: relative;
|
||||
width: 1200px;
|
||||
}
|
||||
|
||||
.scrollblock {
|
||||
width: 100%;
|
||||
padding-top: 100px;
|
||||
min-height: 450px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.divider, .accent {
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
#title {
|
||||
margin: auto;
|
||||
padding-top: 40px;
|
||||
width: 1150px;
|
||||
position: relative;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
#author {
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
top: 180px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: right;
|
||||
font-style: italic;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.twitter-share-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#desc {
|
||||
position: absolute;
|
||||
top: 250px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/*---------------------------------------- Github Banner */
|
||||
#banner {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ body {
|
||||
background-color: powderblue;
|
||||
font-family: Georgia, Times New Roman, Times, serif;
|
||||
font-weight: bold;
|
||||
font-size: 22px;
|
||||
font-size: 20px;
|
||||
text-align: center;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
@ -42,6 +42,7 @@ h2 {
|
||||
font-size: 60px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
margin-bottom: 25px;
|
||||
text-shadow: 0 2px 1px #000;
|
||||
color: #FFB000;
|
||||
font-family: 'Sansita One', cursive;
|
||||
@ -92,7 +93,8 @@ blockquote {
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
|
||||
color:white;
|
||||
font-family: menlo, monospace;
|
||||
}
|
||||
|
||||
code {
|
||||
@ -101,7 +103,7 @@ code {
|
||||
border-radius: 10px;
|
||||
color: white;
|
||||
padding: 5px 15px;
|
||||
font-family: menlo, monospace;
|
||||
|
||||
background: #131420;
|
||||
text-shadow: none;
|
||||
font-size: 0.8em;
|
||||
@ -139,7 +141,7 @@ code {
|
||||
|
||||
.lines-big {
|
||||
width: 300px;
|
||||
height: 4390px;
|
||||
height: 4130px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
|
||||
70
index.html
70
index.html
@ -6,8 +6,8 @@
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen">
|
||||
<link rel="stylesheet" href="css/print.css" type="text/css" media="print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
@ -80,28 +80,29 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Setup</h2>
|
||||
<p>You need a working git installation as prerequirement.</p>
|
||||
<ul>
|
||||
<li>You need a working git installation as prerequisite.</li>
|
||||
<li>Git flow works on OSX, Linux and Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<blockquote>
|
||||
<code>$ brew install git-flow</code>
|
||||
$ brew install git-flow
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
<code>$ apt-get install git-flow</code>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
<code>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
</code>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
For detailed instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
@ -110,15 +111,14 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Getting started</h2>
|
||||
|
||||
<p>Git flow needs to be initialized in order to customize your project setup.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialize</h3>
|
||||
|
||||
<p>Start using git-flow by initializing it inside an existing git repository:</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow init
|
||||
</code>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
|
||||
@ -137,21 +137,19 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Features</h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Develop new features for upcoming releases</li>
|
||||
<li>Typically exist in developers repos only</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Start a new feature</h3>
|
||||
|
||||
<p>Development of new features starting from the 'develop' branch.</p>
|
||||
|
||||
<p>Start developing a new feature with</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature start MYFEATURE
|
||||
</code>
|
||||
git-flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>This action creates a new feature branch based on 'develop' and switches to it</p>
|
||||
|
||||
@ -186,9 +184,7 @@
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature finish MYFEATURE
|
||||
</code>
|
||||
git-flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@ -206,9 +202,7 @@
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature publish MYFEATURE
|
||||
</code>
|
||||
git-flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@ -225,9 +219,7 @@
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
<code>
|
||||
git-flow feature pull MYFEATURE
|
||||
</code>
|
||||
git-flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@ -243,7 +235,7 @@
|
||||
<li>Support preparation of a new production release</li>
|
||||
<li>Allow for minor bug fixes and preparing meta-data for a release</li>
|
||||
</ul>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Start a release</h3>
|
||||
|
||||
@ -251,9 +243,7 @@
|
||||
creates a release branch created from the 'develop' branch.
|
||||
</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release start RELEASE [BASE]
|
||||
</code>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
|
||||
be on the
|
||||
@ -276,17 +266,13 @@
|
||||
<li>Removes the release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release finish RELEASE
|
||||
</code>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
|
||||
<p>It's wise to publish a finished release after finishing it. Do it similar to feature publishing with the
|
||||
command:</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow release publish RELEASE
|
||||
</code>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
|
||||
</div>
|
||||
@ -304,15 +290,13 @@
|
||||
</li>
|
||||
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
|
||||
</ul>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Like the other git flow commands, a hotfix is started with</p>
|
||||
<blockquote>
|
||||
<code>
|
||||
git flow hotfix start RELEASE
|
||||
</code>
|
||||
git flow hotfix start RELEASE
|
||||
</blockquote>
|
||||
<p>The release argument hereby marks the faulty production release</p>
|
||||
</div>
|
||||
@ -343,6 +327,7 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Not all available commands are covered here, only the most important ones</li>
|
||||
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling
|
||||
@ -350,6 +335,7 @@
|
||||
</li>
|
||||
<li>The 'support' feature is still beta, using it is not advised</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user