extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-04-30 14:04:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

update cheat sheet

Browse Source
This commit is contained in:
Daniel 2012-11-14 20:53:26 +01:00
parent 5f7360caa7
commit c1b3a2f4af
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.html
View File

@ -46,7 +46,7 @@
}(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/">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <a href="#" class="active" title="english">en</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">pt_BR</a></p> <p id="translations">translations: <a href="#" class="active" title="english">en</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a></p>
</header> </header>
<div id="main"> <div id="main">
@ -74,6 +74,7 @@
<li>The OSX Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <li>The OSX 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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -100,6 +101,7 @@
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
</blockquote> </blockquote>
<p>You need wget and util-linux to install git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
@ -296,9 +298,9 @@
<p>Like the other git flow commands, a hotfix is started with</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start RELEASE git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The release argument hereby marks the faulty production release</p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -309,9 +311,9 @@
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Finish a hotfix</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge ist tagged.</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge ist tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish RELEASE git flow hotfix finish VERSION
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">