2012-07-31 12:59:15 +02:00
|
|
|
<!DOCTYPE html>
|
2012-08-06 19:33:03 +02:00
|
|
|
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
2012-07-31 12:59:15 +02:00
|
|
|
<head>
|
|
|
|
|
<meta charset="utf-8">
|
|
|
|
|
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
|
|
|
|
<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">
|
|
|
|
|
<link rel="stylesheet" href="css/style.css" type="text/css">
|
|
|
|
|
<script src="js/jquery-1.7.2.min.js"></script>
|
2012-08-09 11:28:23 +02:00
|
|
|
|
2012-07-31 12:59:15 +02:00
|
|
|
|
|
|
|
|
<script type="text/javascript">
|
|
|
|
|
var _gaq = _gaq || [];
|
|
|
|
|
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
|
|
|
|
_gaq.push(['_trackPageview']);
|
|
|
|
|
|
|
|
|
|
(function () {
|
|
|
|
|
var ga = document.createElement('script');
|
|
|
|
|
ga.type = 'text/javascript';
|
|
|
|
|
ga.async = true;
|
|
|
|
|
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
|
|
|
|
var s = document.getElementsByTagName('script')[0];
|
|
|
|
|
s.parentNode.insertBefore(ga, s);
|
|
|
|
|
})();
|
|
|
|
|
</script>
|
|
|
|
|
</head>
|
|
|
|
|
<body>
|
2012-08-05 14:19:48 +02:00
|
|
|
<div id="banner"><a href="">Fork me on GitHub</a></div>
|
|
|
|
|
<header>
|
|
|
|
|
|
2012-08-08 15:04:34 +02:00
|
|
|
<h1 id="title">git-flow cheatsheet</h1>
|
|
|
|
|
|
|
|
|
|
<p id="author">
|
|
|
|
|
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
|
|
|
|
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
|
|
|
|
<script>!function (d, s, id) {
|
|
|
|
|
var js, fjs = d.getElementsByTagName(s)[0];
|
|
|
|
|
if (!d.getElementById(id)) {
|
|
|
|
|
js = d.createElement(s);
|
|
|
|
|
js.id = id;
|
|
|
|
|
js.src = "//platform.twitter.com/widgets.js";
|
|
|
|
|
fjs.parentNode.insertBefore(js, fjs);
|
|
|
|
|
}
|
|
|
|
|
}(document, "script", "twitter-wjs");</script>
|
|
|
|
|
</p>
|
|
|
|
|
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
2012-08-05 14:19:48 +02:00
|
|
|
</header>
|
|
|
|
|
|
|
|
|
|
<div id="main">
|
2012-08-09 11:28:23 +02:00
|
|
|
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock">
|
2012-08-09 11:28:23 +02:00
|
|
|
<h2>About</h2>
|
2012-08-06 19:33:03 +02:00
|
|
|
|
|
|
|
|
<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 class="divider">★ ★ ★</p>
|
|
|
|
|
|
|
|
|
|
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p>
|
|
|
|
|
|
|
|
|
|
<p class="divider">★ ★ ★</p>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="scrollblock">
|
2012-08-09 11:28:23 +02:00
|
|
|
<h2>Basic tips</h2>
|
2012-08-06 19:33:03 +02:00
|
|
|
<ul>
|
|
|
|
|
<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
|
|
|
|
|
git-flow support
|
|
|
|
|
</li>
|
|
|
|
|
</ul>
|
|
|
|
|
<p class="divider">★ ★ ★</p>
|
|
|
|
|
</div>
|
|
|
|
|
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock" style="height: 800px;">
|
|
|
|
|
<h2>Setup</h2>
|
|
|
|
|
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>OSX</h3>
|
|
|
|
|
<blockquote>
|
|
|
|
|
<code>$ brew install git-flow</code>
|
|
|
|
|
</blockquote>
|
|
|
|
|
<h3>Linux</h3>
|
|
|
|
|
<blockquote>
|
|
|
|
|
<code>$ apt-get install git-flow</code>
|
|
|
|
|
</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>
|
|
|
|
|
</blockquote>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-05 14:19:48 +02:00
|
|
|
<p>
|
2012-08-06 19:33:03 +02:00
|
|
|
You need a working git installation as prerequirement.<br/>
|
|
|
|
|
For detailed instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
|
|
|
|
wiki</a>.
|
2012-08-05 14:19:48 +02:00
|
|
|
</p>
|
2012-08-06 19:33:03 +02:00
|
|
|
<img src="img/download.png" alt="install git-flow"/>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div class="scrollblock">
|
2012-08-09 11:28:23 +02:00
|
|
|
<h2>Getting started</h2>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Initialize</h3>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<p>Start using git-flow by initializing it inside an existing 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/>
|
|
|
|
|
It's recommended to use the default values.
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="initialize"></div>
|
|
|
|
|
<div class="lines-small"></div>
|
|
|
|
|
<div class="lines-open"></div>
|
|
|
|
|
<div class="lines-big"></div>
|
2012-08-08 15:04:34 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="scrollblock" style="height: 600px;">
|
|
|
|
|
<h2>Features</h2>
|
2012-08-06 19:33:03 +02:00
|
|
|
<ul class="narrow">
|
|
|
|
|
<li>Develop new features for upcoming releases</li>
|
|
|
|
|
<li>Typically exist in developers repos only</li>
|
|
|
|
|
</ul>
|
|
|
|
|
|
|
|
|
|
<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>
|
|
|
|
|
<p>This action creates a new feature branch based on 'develop' and switches to it</p>
|
2012-08-08 15:04:34 +02:00
|
|
|
|
|
|
|
|
<!--
|
|
|
|
|
- Bump the version number now!
|
|
|
|
|
- Start committing last-minute fixes in preparing your release
|
|
|
|
|
- When done, run:
|
|
|
|
|
|
|
|
|
|
git flow release finish 'testrelease'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-->
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="feature-start"></div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock">
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Finish up a feature</h3>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<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">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="feature-end"></div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock">
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Publish a feature</h3>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<p>
|
|
|
|
|
Are you developing a feature in collaboration? <br/>
|
|
|
|
|
Publish a feature to the remote server so it can be used by other users.
|
|
|
|
|
</p>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<blockquote>
|
|
|
|
|
<code>
|
|
|
|
|
git-flow feature publish MYFEATURE
|
|
|
|
|
</code>
|
|
|
|
|
</blockquote>
|
2012-08-05 14:19:48 +02:00
|
|
|
</div>
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="col-2">
|
2012-08-09 12:52:39 +02:00
|
|
|
<div class="feature-publish"></div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock">
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Getting a published feature</h3>
|
2012-08-08 15:04:34 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<p>
|
|
|
|
|
Get a feature published by another user and track remote changes.
|
|
|
|
|
</p>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<blockquote>
|
|
|
|
|
<code>
|
|
|
|
|
git-flow feature pull MYFEATURE
|
|
|
|
|
</code>
|
|
|
|
|
</blockquote>
|
2012-08-05 14:19:48 +02:00
|
|
|
</div>
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="col-2">
|
2012-08-09 12:52:39 +02:00
|
|
|
<div class="feature-pull"></div>
|
2012-08-05 14:19:48 +02:00
|
|
|
</div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
|
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock" style="height: 900px;">
|
2012-08-09 11:28:23 +02:00
|
|
|
<h2>Make a release</h2>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<ul>
|
|
|
|
|
<li>Support preparation of a new production release</li>
|
|
|
|
|
<li>Allow for minor bug fixes and preparing meta-data for a release</li>
|
|
|
|
|
</ul>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Start a release</h3>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<p>To start a release, use the git flow release command. It</p>
|
|
|
|
|
creates a release branch created from the 'develop' branch.
|
|
|
|
|
</p>
|
|
|
|
|
<blockquote>
|
|
|
|
|
<code>
|
|
|
|
|
git flow release start RELEASE [BASE]
|
|
|
|
|
</code>
|
|
|
|
|
</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
|
|
|
|
|
'develop' branch.</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="release-start"></div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock" style="height: 900px;">
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Finish up a release</h3>
|
|
|
|
|
|
|
|
|
|
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
|
|
|
|
|
<ul>
|
|
|
|
|
<li>Merges the release branch back into 'master'</li>
|
|
|
|
|
<li>Tags the release with it's name</li>
|
|
|
|
|
<li>Back-merges the release into 'develop'</li>
|
|
|
|
|
<li>Removes the release branch</li>
|
|
|
|
|
</ul>
|
|
|
|
|
<blockquote>
|
|
|
|
|
<code>
|
|
|
|
|
git flow release finish RELEASE
|
|
|
|
|
</code>
|
|
|
|
|
</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>
|
|
|
|
|
</blockquote>
|
2012-08-09 12:52:39 +02:00
|
|
|
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="release-end"></div>
|
2012-08-09 12:52:39 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock" style="height: 800px;">
|
2012-08-09 11:28:23 +02:00
|
|
|
<h2>Hotfixes</h2>
|
2012-08-06 19:33:03 +02:00
|
|
|
|
|
|
|
|
<ul>
|
|
|
|
|
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
|
|
|
|
|
</li>
|
|
|
|
|
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
|
|
|
|
|
</ul>
|
|
|
|
|
|
|
|
|
|
<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>
|
|
|
|
|
</blockquote>
|
|
|
|
|
<p>The release argument hereby marks the faulty production release</p>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="hotfix-start"></div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
2012-08-05 14:19:48 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="scrollblock">
|
|
|
|
|
<div class="col-1">
|
|
|
|
|
<h3>Finish a hotfix</h3>
|
|
|
|
|
|
2012-08-09 12:52:39 +02:00
|
|
|
<p>By finishing a hotfix it gets merged back into develp and master. Additionally the master merge ist tagged.</p>
|
2012-08-05 14:19:48 +02:00
|
|
|
</div>
|
2012-08-06 19:33:03 +02:00
|
|
|
<div class="col-2">
|
2012-08-09 12:52:39 +02:00
|
|
|
<div class="hotfix-end"></div>
|
2012-08-08 15:04:34 +02:00
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
2012-08-09 11:28:23 +02:00
|
|
|
<div>
|
2012-08-08 15:04:34 +02:00
|
|
|
<div class="col-1"></div>
|
|
|
|
|
<div class="col-2">
|
2012-08-09 11:28:23 +02:00
|
|
|
<div class="lines-close"></div>
|
|
|
|
|
<div class="lines-small-end"></div>
|
2012-08-05 14:19:48 +02:00
|
|
|
</div>
|
2012-08-06 19:33:03 +02:00
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="scrollblock">
|
|
|
|
|
<h2>Backlog</h2>
|
|
|
|
|
<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
|
|
|
|
|
collection
|
|
|
|
|
</li>
|
|
|
|
|
<li>The 'support' feature is still beta, using it is not advised</li>
|
|
|
|
|
</ul>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
2012-08-08 15:04:34 +02:00
|
|
|
<footer>
|
|
|
|
|
<div class="scrollblock">
|
|
|
|
|
<h2>Comments</h2>
|
2012-07-31 12:59:15 +02:00
|
|
|
|
2012-08-08 15:04:34 +02:00
|
|
|
<div id="disqus_thread"></div>
|
|
|
|
|
</div>
|
|
|
|
|
</footer>
|
2012-07-31 12:59:15 +02:00
|
|
|
|
2012-08-06 19:33:03 +02:00
|
|
|
<script type="text/javascript">
|
|
|
|
|
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
|
|
|
|
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
|
|
|
|
|
|
|
|
|
/* * * DON'T EDIT BELOW THIS LINE * * */
|
|
|
|
|
(function () {
|
|
|
|
|
var dsq = document.createElement('script');
|
|
|
|
|
dsq.type = 'text/javascript';
|
|
|
|
|
dsq.async = true;
|
|
|
|
|
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
|
|
|
|
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
|
|
|
|
})();
|
2012-07-31 12:59:15 +02:00
|
|
|
</script>
|
2012-08-06 19:33:03 +02:00
|
|
|
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
|
|
|
|
</noscript>
|
|
|
|
|
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
2012-07-31 12:59:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
</body>
|
|
|
|
|
</html>
|
