<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>nvie.com &#187; Git</title>
	<atom:link href="http://nvie.com/archives/tag/git/feed" rel="self" type="application/rss+xml" />
	<link>http://nvie.com</link>
	<description>Anything that interests me.</description>
	<lastBuildDate>Tue, 24 Aug 2010 11:21:13 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.0.1</generator>
		<item>
		<title>gitflow 0.1 released</title>
		<link>http://nvie.com/archives/438</link>
		<comments>http://nvie.com/archives/438#comments</comments>
		<pubDate>Tue, 26 Jan 2010 12:49:56 +0000</pubDate>
		<dc:creator>Vincent Driessen</dc:creator>
				<category><![CDATA[Git]]></category>
		<category><![CDATA[gitflow]]></category>

		<guid isPermaLink="false">http://nvie.com/?p=438</guid>
		<description><![CDATA[After the overwhelming attention and feedback on the Git branching model post, a general consensus was that this workflow would benefit from some form of proper scriptability. The workflow works seamlessly if you perform the steps involved manually, but hey&#8230; manually is manually, really. UPDATE 2/4/2010: Anyone reading this: I recommend NOT USING this very [...]]]></description>
			<content:encoded><![CDATA[<p>After the overwhelming attention and feedback on the <a href="/archives/323">Git branching model post</a>, a general consensus was that this workflow would benefit from some form of proper scriptability. The workflow works seamlessly if you perform the steps involved manually, but hey&#8230; manually is manually, really.</p>
<blockquote><p><ins datetime="2010-02-04T11:10:19+00:00"><strong>UPDATE 2/4/2010</strong>:<br />
Anyone reading this: I recommend NOT USING this very early release, but to jump on the <a href="http://github.com/nvie/gitflow/tree/develop">current develop tip</a>, which is much more mature. Release 0.2 is coming very soon.</ins></p></blockquote>
<p>An assisting tool (dubbed <code>gitflow</code>) was therefore created to provide simple, high-level commands to adopt the workflow into your own software development process. It&#8217;s free and it&#8217;s open source. Feel free to contribute to it if you like.</p>
<blockquote><p>Fork me on Github:<br />
<a href="http://github.com/nvie/gitflow">http://github.com/nvie/gitflow</a></p></blockquote>
<p>Since this morning, the first working <a href="http://github.com/nvie/gitflow/downloads">release 0.1</a> was tagged, albeit very basic.</p>
<h3>A quick walkthrough</h3>
<p>The <code>gitflow</code> script essentially features six subcommands: paired start/finish commands for managing the different types of branches from the originating article:</p>
<ul>
<li>Feature branches
<ul>
<li><code>gitflow start feature <em>myfeature</em></code></li>
<li><code>gitflow finish feature <em>myfeature</em></code></li>
</ul>
</li>
<li>Release branches
<ul>
<li><code>gitflow start release <em>version-id</em></code></li>
<li><code>gitflow finish release <em>version-id</em></code></li>
</ul>
</li>
<li>Hotfix branches
<ul>
<li><code>gitflow start hotfix <em>version-id</em></code></li>
<li><code>gitflow finish hotfix <em>version-id</em></code></li>
</ul>
</li>
</ul>
<p>Each of these scripts exactly reports what actions were taken and what follow-up actions are required by the user. This output will be polished in future versions to improve the <a href="http://en.wikipedia.org/wiki/User_experience_design">UX</a>. An example output:</p>
<pre>
<strong>$ gitflow finish feature foo</strong>
Branches 'develop' and 'origin/develop' have diverged.
And local branch 'develop' is ahead of 'origin/develop'.
Switched to branch "develop"
Your branch is ahead of 'origin/develop' by 12 commits.
Merge made by recursive.
 README |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Deleted branch foo (cd3effb).

Summary of actions:
- The feature branch 'foo' was merged into 'develop'
- Feature branch 'foo' has been removed
- You are now on branch 'develop'
</pre>
<h3>Limitations</h3>
<p>The script is very limited at the moment yet, but future versions will fix that, too. Some of the main limitations:</p>
<ul>
<li>Branch names (<code>master</code>, <code>develop</code>) and the remote repo name (<code>origin</code>) are currently fixed.</li>
<li>There is no support for dealing with merge conflicts yet.</li>
<li>There is no support for <code>support-*</code> branches (see the <a href="/archives/323#comment-185">original comment</a> that proposed this extension)</li>
<li>There is no documentation.</li>
<li>There is no installer.</li>
</ul>
<p>However, as this post is written, some of the limitations are already taken care of by community members. Power to the open source!</p>
]]></content:encoded>
			<wfw:commentRss>http://nvie.com/archives/438/feed</wfw:commentRss>
		<slash:comments>2</slash:comments>
		</item>
	</channel>
</rss>
