extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-01-31 18:49:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a spelling error, add push tags to finish release

Browse Source
This commit is contained in:
Daniel Kummer 2013-08-21 14:20:05 +02:00
parent 0cfc33ed8b
commit 828988a929
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/style.css
View File

@ -158,7 +158,7 @@ code {
.lines-big { .lines-big {
width: 300px; width: 300px;
height: 4140px; height: 4315px;
background-repeat: repeat-y; background-repeat: repeat-y;
background: url("../img/lines-big.png"); background: url("../img/lines-big.png");
position: absolute; position: absolute;

8
index.html
View File

@ -77,10 +77,10 @@
<h2>Basic tips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>The OSX Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support git-flow support
</li> </li>
<li>- Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -276,13 +276,15 @@
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Tags the release with it's name</li> <li>Tags the release with its name</li>
<li>Back-merges the release into 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Removes the release branch</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>