mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2025-04-23 10:38:18 +02:00
update all
This commit is contained in:
Daniel Kummer
parent
b871e97e36
commit
3e1238e957
65
README.md
65
README.md
@ -1,4 +1,67 @@
|
|||||||
git-flow-cheatsheet
|
git-flow-cheatsheet
|
||||||
===================
|
===================
|
||||||
|
|
||||||
A cheatsheet on the usage of git flow
|
A cheatsheet on the usage of git flow, visit http://danielkummer.github.com/git-flow-cheatsheet/
|
||||||
|
|
||||||
|
GIT FLOW
|
||||||
|
========
|
||||||
|
|
||||||
|
Git extensions to provide high-level repository operations for Vincent
|
||||||
|
Driessen's branching model. — Read more:
|
||||||
|
http://nvie.com/posts/a-successful-git-branching-model/
|
||||||
|
|
||||||
|
INIT:
|
||||||
|
$ git flow init
|
||||||
|
|
||||||
|
TRACK DEVELOP REMOTELY ON GITHUB:
|
||||||
|
$ git push origin develop
|
||||||
|
|
||||||
|
FEATURES:
|
||||||
|
Use to develop new features starting from the develop branch. Merge back into
|
||||||
|
develop branch waiting for a reasonable amount of features to be there before
|
||||||
|
declaring it a release.
|
||||||
|
$ git flow feature
|
||||||
|
$ git flow feature start <name>
|
||||||
|
$ git flow feature finish <name>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
usage: git flow feature [list] [-v]
|
||||||
|
git flow feature start [-F] <name> [<base>]
|
||||||
|
git flow feature finish [-rFk] <name|nameprefix>
|
||||||
|
git flow feature publish <name>
|
||||||
|
git flow feature track <name>
|
||||||
|
git flow feature diff [<name|nameprefix>]
|
||||||
|
git flow feature rebase [-i] [<name|nameprefix>]
|
||||||
|
git flow feature checkout [<name|nameprefix>]
|
||||||
|
git flow feature pull <remote> [<name>]
|
||||||
|
|
||||||
|
|
||||||
|
RELEASES:
|
||||||
|
Use to group together latest development (features) add a few finishing touches
|
||||||
|
if necessary and send to production. All last changes will merge back to master
|
||||||
|
and develop so new features will start from current release.
|
||||||
|
$ git flow release
|
||||||
|
$ git flow release start <release> [<base>]
|
||||||
|
$ git flow release finish <release>
|
||||||
|
|
||||||
|
usage: git flow release [list] [-v]
|
||||||
|
git flow release start [-F] <version>
|
||||||
|
git flow release finish [-Fsumpk] <version>
|
||||||
|
git flow release publish <name>
|
||||||
|
git flow release track <name>
|
||||||
|
|
||||||
|
|
||||||
|
HOTFIXES:
|
||||||
|
Similar to releases but the hotfix branch starts off master to avoid unvoluntary
|
||||||
|
send to production of unwanted features that my be present in branches. The
|
||||||
|
quick fix must be used when an important bug arises in production which must be
|
||||||
|
fixed and can't wait for other features to be ready. It merges back to master
|
||||||
|
and develop.
|
||||||
|
$ git flow hotfix
|
||||||
|
$ git flow hotfix start <release> [<base>]
|
||||||
|
$ git flow hotfix finish <release>
|
||||||
|
|
||||||
|
usage: git flow hotfix [list] [-v]
|
||||||
|
git flow hotfix start [-F] <version> [<base>]
|
||||||
|
git flow hotfix finish [-Fsumpk] <version>
|
||||||
|
|||||||
263
css/style.css
263
css/style.css
@ -1,9 +1,40 @@
|
|||||||
|
/*---------------------------------------- Colors */
|
||||||
|
/*.color1 {
|
||||||
|
background-color: lightskyblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.color2 {
|
||||||
|
background-color: lightblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color3 {
|
||||||
|
background-color: deepskyblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color4 {
|
||||||
|
background-color: darkturquoise;
|
||||||
|
}
|
||||||
|
|
||||||
|
.color5 {
|
||||||
|
background-color: cornflowerblue;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*---------------------------------------- Text */
|
||||||
|
|
||||||
body {
|
body {
|
||||||
background: rgba(165, 170, 255, 0.15);
|
background-color: powderblue;
|
||||||
font-family: Georgia, Times New Roman, Times, serif;
|
font-family: Georgia, Times New Roman, Times, serif;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
transition: background-color 1s linear;
|
||||||
|
-moz-transition: background-color 1s linear; /* FF3.7+ */
|
||||||
|
-o-transition: background-color 1s linear; /* Opera 10.5 */
|
||||||
|
-webkit-transition: background-color 1s linear; /* Saf3.2+, Chrome */
|
||||||
|
adding: 0;
|
||||||
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
@ -35,7 +66,7 @@ h3 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
width: 80%;
|
width: 95%;
|
||||||
margin: 20px auto;
|
margin: 20px auto;
|
||||||
text-shadow: 0 2px 1px #fff;
|
text-shadow: 0 2px 1px #fff;
|
||||||
color: #222438;
|
color: #222438;
|
||||||
@ -49,23 +80,31 @@ a, a:visited {
|
|||||||
|
|
||||||
ul {
|
ul {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
|
text-align: left;
|
||||||
|
margin-left: 0;
|
||||||
|
padding-left: 1em;
|
||||||
|
text-indent: -1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul li:before {
|
||||||
|
content: "\2605\a0"
|
||||||
}
|
}
|
||||||
|
|
||||||
.download {
|
.download {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
pre {
|
/** coding block */
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
blockquote {
|
blockquote {
|
||||||
|
color: white;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
width: 720px;
|
|
||||||
margin: 10px auto;
|
margin: 10px auto;
|
||||||
background: #C5C3DE;
|
background: #131420;
|
||||||
border: solid 2px #69697A;
|
border-bottom: 2px solid #30334F;
|
||||||
padding: 0 40px;
|
border-right: 2px solid #30334F;
|
||||||
|
border-radius: 7px;
|
||||||
|
padding: 5px 30px;
|
||||||
|
font-size: 0.8em;
|
||||||
}
|
}
|
||||||
|
|
||||||
code {
|
code {
|
||||||
@ -73,23 +112,82 @@ code {
|
|||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*---------------------------------------- Images */
|
||||||
|
|
||||||
|
div#init-img {
|
||||||
|
background: url("../img/init.png") no-repeat scroll center center transparent;
|
||||||
|
height: 122px;
|
||||||
|
width: 122px;
|
||||||
|
position: relative;
|
||||||
|
z-index: 99;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#feature-start-img {
|
||||||
|
background: url("../img/feature-start.png") no-repeat scroll center center transparent;
|
||||||
|
position: relative;
|
||||||
|
width: 321px;
|
||||||
|
height: 386px;
|
||||||
|
left: -8px;
|
||||||
|
z-index: 99;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#feature-finish-img {
|
||||||
|
background: url("../img/feature-finish.png") no-repeat scroll center center transparent;
|
||||||
|
position: relative;
|
||||||
|
width: 321px;
|
||||||
|
height: 338px;
|
||||||
|
left: -8px;
|
||||||
|
z-index: 99;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#blue-line-img {
|
||||||
|
background: url("../img/blue_line.png") repeat-y scroll center center transparent;
|
||||||
|
width: 46px;
|
||||||
|
position: relative;
|
||||||
|
height: 1500px;
|
||||||
|
left: 37px;
|
||||||
|
top: -10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div#violet-line-img {
|
||||||
|
background: url("../img/violet-line.png") repeat-y scroll center center transparent;
|
||||||
|
width: 46px;
|
||||||
|
position: relative;
|
||||||
|
height: 300px;
|
||||||
|
left: 184px;
|
||||||
|
top: -60px;
|
||||||
|
}
|
||||||
|
|
||||||
/*---------------------------------------- BLOCKS */
|
/*---------------------------------------- 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 {
|
.scrollblock {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 600px;
|
min-height: 600px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.scrollblock h2 {
|
.scrollblock h2 {
|
||||||
padding-top: 100px;
|
padding-top: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.divider {
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider, .accent {
|
.divider, .accent {
|
||||||
color: #69697A;
|
color: #69697A;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
@ -113,13 +211,10 @@ code {
|
|||||||
opacity: .8;
|
opacity: .8;
|
||||||
}
|
}
|
||||||
|
|
||||||
#intro {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#title {
|
#title {
|
||||||
margin: 80px auto 0;
|
margin: 80px auto 0;
|
||||||
width: 1100px;
|
width: 1150px;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
}
|
}
|
||||||
@ -133,7 +228,7 @@ code {
|
|||||||
text-align: right;
|
text-align: right;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
color: #D92B00;
|
color: #D92B00;
|
||||||
z-index:100;
|
z-index: 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
.twitter-share-button {
|
.twitter-share-button {
|
||||||
@ -164,78 +259,6 @@ code {
|
|||||||
height: 500px;
|
height: 500px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#examples-transition {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#examples-parallax {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#parallax2 {
|
|
||||||
position: absolute;
|
|
||||||
top: 200px;
|
|
||||||
left: -50px;
|
|
||||||
color: #C5C3DE;
|
|
||||||
opacity: .2;
|
|
||||||
font-size: 210px;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#parallax3 {
|
|
||||||
position: absolute;
|
|
||||||
top: 320px;
|
|
||||||
right: 40px;
|
|
||||||
color: #C5C3DE;
|
|
||||||
opacity: .4;
|
|
||||||
font-size: 160px;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#easing span {
|
|
||||||
position: relative;
|
|
||||||
top:0;
|
|
||||||
left:0;
|
|
||||||
}
|
|
||||||
#easing_bottom {
|
|
||||||
width: 330px;
|
|
||||||
height: 13px;
|
|
||||||
margin: auto;
|
|
||||||
background: #131420;
|
|
||||||
border-bottom: 1px solid #30334F;
|
|
||||||
position: relative;
|
|
||||||
top: 276px;
|
|
||||||
border-radius: 2px;
|
|
||||||
-webkit-border-radius: 4px;
|
|
||||||
-moz-border-radius: 4px;
|
|
||||||
-o-border-radius: 4px;
|
|
||||||
-ms-border-radius: 4px;
|
|
||||||
border-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#howtouse {
|
|
||||||
height: 2100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#disclaimer {
|
|
||||||
font-size: 18px;
|
|
||||||
font-style: italic;
|
|
||||||
font-weight: normal;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#instructions {
|
|
||||||
padding-top: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#instructions p {
|
|
||||||
margin: 0px auto 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#instructions-animation {
|
|
||||||
padding-top: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.param-list {
|
.param-list {
|
||||||
color: #C5C3DE;
|
color: #C5C3DE;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
@ -259,7 +282,57 @@ code {
|
|||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
#credits {
|
/*---------------------------------------- Banner */
|
||||||
height: 525px;
|
#banner {
|
||||||
margin-top: 100px;
|
height: 149px;
|
||||||
|
width: 149px;
|
||||||
|
overflow: hidden;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#banner a {
|
||||||
|
|
||||||
|
display: block;
|
||||||
|
width: 190px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans serif;
|
||||||
|
background-color: #333;
|
||||||
|
color: #FFF;
|
||||||
|
word-spacing: 2px;
|
||||||
|
text-decoration: none;
|
||||||
|
padding: 5px 15px 5px 25px;
|
||||||
|
|
||||||
|
position: relative;
|
||||||
|
left: 20px;
|
||||||
|
top: -37px;
|
||||||
|
text-align: center;
|
||||||
|
|
||||||
|
-moz-transform-origin: 0 0;
|
||||||
|
-moz-transform: rotate(45deg);
|
||||||
|
-moz-box-shadow: 1px 1px 5px 1px #666;
|
||||||
|
|
||||||
|
-webkit-transform-origin: 0 0;
|
||||||
|
-webkit-transform: rotate(45deg);
|
||||||
|
-webkit-box-shadow: 1px 1px 5px 1px #666;
|
||||||
|
|
||||||
|
-ms-transform-origin: 0 0;
|
||||||
|
-ms-transform: rotate(45deg);
|
||||||
|
-ms-box-shadow: 1px 1px 5px 1px #666;
|
||||||
|
|
||||||
|
transform-origin: 0 0;
|
||||||
|
transform: rotate(45deg);
|
||||||
|
box-shadow: 1px 1px 5px 1px #666;
|
||||||
|
|
||||||
|
background-image: linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||||
|
background-image: -o-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||||
|
background-image: -moz-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||||
|
background-image: -webkit-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||||
|
background-image: -ms-linear-gradient(bottom, #000000 3%, #666666 5%, #000000 7%, #000000 93%, #666666 95%, #000000 97%);
|
||||||
|
|
||||||
|
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.03, #000000), color-stop(0.05, #666666), color-stop(0.07, #000000), color-stop(0.93, #000000), color-stop(0.95, #666666), color-stop(0.97, #000000));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
BIN
img/blue_line.png
Normal file
BIN
img/blue_line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 888 B |
BIN
img/feature-finish.png
Normal file
BIN
img/feature-finish.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
BIN
img/feature-start.png
Normal file
BIN
img/feature-start.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
BIN
img/init.png
Normal file
BIN
img/init.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
BIN
img/violet-line.png
Normal file
BIN
img/violet-line.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 883 B |
199
index.html
199
index.html
@ -7,8 +7,9 @@
|
|||||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
<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">
|
<link rel="stylesheet" href="css/normalize.css" type="text/css">
|
||||||
<link rel="stylesheet" href="css/style.css" type="text/css">
|
<link rel="stylesheet" href="css/style.css" type="text/css">
|
||||||
|
|
||||||
|
|
||||||
<script src="js/jquery-1.7.2.min.js"></script>
|
<script src="js/jquery-1.7.2.min.js"></script>
|
||||||
<script src="js/jquery.lettering-0.6.1.min.js"></script>
|
|
||||||
<script src="js/jquery.scrollorama.js"></script>
|
<script src="js/jquery.scrollorama.js"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@ -27,7 +28,12 @@
|
|||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="scrollblock" id="intro">
|
<p id="console"></p>
|
||||||
|
|
||||||
|
<div id="banner"><a href="">Fork me on GitHub</a></div>
|
||||||
|
|
||||||
|
<header>
|
||||||
|
<div class="scrollblock">
|
||||||
<h1 id="title">git-flow cheatsheet</h1>
|
<h1 id="title">git-flow cheatsheet</h1>
|
||||||
|
|
||||||
<p id="author">
|
<p id="author">
|
||||||
@ -44,51 +50,198 @@
|
|||||||
}(document, "script", "twitter-wjs");</script>
|
}(document, "script", "twitter-wjs");</script>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">nvie</a>
|
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||||
|
|
||||||
|
<!-- <p id="download">
|
||||||
|
<span class="accent">★</span>
|
||||||
|
<a href="files/git-flow-cheatsheet.pdf"
|
||||||
|
onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-flow-cheatsheet');return false;" class="download">Download
|
||||||
|
as pdf</a>
|
||||||
|
<span class="accent">★</span>
|
||||||
|
</p>-->
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
|
||||||
|
<div id="main">
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<h2>About</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
git-flow are a set of git extensions to provide high-level repository operations for Vincent
|
||||||
|
Driessen's branching model.
|
||||||
|
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
<p class="divider">★ ★ ★</p>
|
||||||
|
|
||||||
<p id="console"></p>
|
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p>
|
||||||
|
|
||||||
<div class="scrollblock" id="into">
|
<p class="divider">★ ★ ★</p>
|
||||||
<h2 id="zoom-in">sorry..</h2>
|
</div>
|
||||||
<p>This is still a work in progress, stay tuned for update (happening soon)</p>
|
|
||||||
</div>
|
<div class="scrollblock">
|
||||||
|
<h2>Basic tips</h2>
|
||||||
|
<ul>
|
||||||
|
<li>git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p class="divider">★ ★ ★</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<h2>Initialize</h2>
|
||||||
|
|
||||||
|
<div class="col-1">
|
||||||
|
<h3>git flow init</h3>
|
||||||
|
|
||||||
|
<p>Start using git-flow by initializing it inside a git repository</p>
|
||||||
|
<blockquote>
|
||||||
|
<code>
|
||||||
|
git flow init
|
||||||
|
</code>
|
||||||
|
</blockquote>
|
||||||
|
<p>
|
||||||
|
You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
|
||||||
|
I strongly recommend using the default values.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<div id="init-img"></div>
|
||||||
|
<div id="blue-line-img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<h2>Features</h2>
|
||||||
|
|
||||||
|
<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>
|
||||||
|
</blockquote>
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<div id="feature-start-img"></div>
|
||||||
|
<div id="violet-line-img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<div class="col-1">
|
||||||
|
<h3>Finish up a feature</h3>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Finish the development of a feature.
|
||||||
|
This action performs the following
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>Merged MYFEATURE into develop</li>
|
||||||
|
<li>Removes the feature branch</li>
|
||||||
|
<li>Switches back to develop branch</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<blockquote>
|
||||||
|
<code>
|
||||||
|
git-flow feature finish MYFEATURE
|
||||||
|
</code>
|
||||||
|
</blockquote>
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<div id="feature-finish-img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<div class="col-1">
|
||||||
|
<h3>Publish a feature</h3>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Publish a feature to the remote server so it can be used by other users.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<blockquote>
|
||||||
|
<code>
|
||||||
|
git-flow feature publish MYFEATURE
|
||||||
|
</code>
|
||||||
|
</blockquote>
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<div id="feature-publish-img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<div class="col-1">
|
||||||
|
<h3>Getting a published feature</h3>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Getting a published feature from the remote server and tracking remote changes.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<blockquote>
|
||||||
|
<code>
|
||||||
|
git-flow feature pull MYFEATURE
|
||||||
|
</code>
|
||||||
|
</blockquote>
|
||||||
|
</div>
|
||||||
|
<div class="col-2">
|
||||||
|
<div id="feature-publish-img"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="scrollblock">
|
||||||
|
<h2>git-flow release</h2>
|
||||||
|
</div>
|
||||||
|
<div class="scrollblock">
|
||||||
|
<h2>git-flow hotfix</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="scrollblock">
|
|
||||||
<p> another block</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
var scrollorama = $.scrollorama({ blocks:'.scrollblock' });
|
var scrollorama = $.scrollorama({ blocks:'.scrollblock' });
|
||||||
|
|
||||||
|
var colorClassMatcher = function (index, classname) {
|
||||||
|
var matches = classname.match(/color\d+/g) || [];
|
||||||
|
return (matches.join(' '));
|
||||||
|
};
|
||||||
|
|
||||||
// assign function to add behavior for onBlockChange event
|
// assign function to add behavior for onBlockChange event
|
||||||
scrollorama.onBlockChange(function () {
|
scrollorama.onBlockChange(function () {
|
||||||
var i = scrollorama.blockIndex;
|
var i = scrollorama.blockIndex;
|
||||||
$('#console')
|
$('#console').css('display', 'block').text('onBlockChange | blockIndex:' + i + ' | current block: ' + scrollorama.settings.blocks.eq(i).attr('id'));
|
||||||
.css('display', 'block')
|
$('body').removeClass(colorClassMatcher);
|
||||||
.text('onBlockChange | blockIndex:' + i + ' | current block: ' + scrollorama.settings.blocks.eq(i).attr('id'));
|
$('body').addClass('color' + i);
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#title').lettering();
|
/*
|
||||||
$('#title span')
|
/*
|
||||||
.css('display', 'block')
|
scrollorama.animate('.fly-in', { delay:300, duration:200, property:'left', start:-1400, end:0 });
|
||||||
.css('float', 'left');
|
scrollorama.animate('#zoom-in', { delay:200, duration:600, property:'zoom', start:0 });
|
||||||
$('.char9').css('padding-left', '6px');
|
|
||||||
|
|
||||||
scrollorama.animate('#zoom-in', { delay:200, duration:600, property:'zoom', start:8 });
|
|
||||||
// animate some examples
|
// animate some examples
|
||||||
scrollorama.animate('#unpin', { duration:500, property:'padding-top', start:400, pin:true });
|
scrollorama.animate('#unpin', { duration:500, property:'padding-top', start:400, pin:true });
|
||||||
scrollorama.animate('#fade-in', { delay:400, duration:300, property:'opacity', start:0 });
|
scrollorama.animate('#fade-in', { delay:400, duration:300, property:'opacity', start:0 });
|
||||||
scrollorama.animate('#fly-in', { delay:400, duration:300, property:'left', start:-1400, end:0 });
|
|
||||||
scrollorama.animate('#rotate-in', { duration:800, property:'rotate', start:720 });
|
scrollorama.animate('#rotate-in', { duration:800, property:'rotate', start:720 });
|
||||||
scrollorama.animate('#any', { delay:700, duration:200, property:'opacity', start:0 });
|
scrollorama.animate('#any', { delay:700, duration:200, property:'opacity', start:0 });
|
||||||
scrollorama.animate('#any', { delay:800, duration:200, property:'letter-spacing', start:18 });
|
scrollorama.animate('#any', { delay:800, duration:200, property:'letter-spacing', start:18 });
|
||||||
|
|
||||||
|
|
||||||
// animate the parallaxing
|
// animate the parallaxing
|
||||||
scrollorama.animate('#parallax2', { delay:400, duration:600, property:'top', start:800, end:-800 });
|
scrollorama.animate('#parallax2', { delay:400, duration:600, property:'top', start:800, end:-800 });
|
||||||
scrollorama.animate('#parallax3', { delay:200, duration:1200, property:'top', start:500, end:-500 });
|
scrollorama.animate('#parallax3', { delay:200, duration:1200, property:'top', start:500, end:-500 });*/
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
2
js/jquery.lettering-0.6.1.min.js
vendored
2
js/jquery.lettering-0.6.1.min.js
vendored
@ -1,2 +0,0 @@
|
|||||||
/* Lettering.JS 0.6.1 by Dave Rupert - http://daverupert.com */
|
|
||||||
(function($){function injector(t,splitter,klass,after){var a=t.text().split(splitter),inject='';if(a.length){$(a).each(function(i,item){inject+='<span class="'+klass+(i+1)+'">'+item+'</span>'+after});t.empty().append(inject)}}var methods={init:function(){return this.each(function(){injector($(this),'','char','')})},words:function(){return this.each(function(){injector($(this),' ','word',' ')})},lines:function(){return this.each(function(){var r="eefec303079ad17405c889e092e105b0";injector($(this).children("br").replaceWith(r).end(),r,'line','')})}};$.fn.lettering=function(method){if(method&&methods[method]){return methods[method].apply(this,[].slice.call(arguments,1))}else if(method==='letters'||!method){return methods.init.apply(this,[].slice.call(arguments,0))}$.error('Method '+method+' does not exist on jQuery.lettering');return this}})(jQuery);
|
|
||||||
Loading…
Reference in New Issue
Block a user