<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	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/"
		>
<channel>
	<title>Comments on: Working with git branches</title>
	<atom:link href="http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/feed/" rel="self" type="application/rss+xml" />
	<link>http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/</link>
	<description>Just another WordPress weblog</description>
	<lastBuildDate>Fri, 20 Nov 2009 23:38:19 +0100</lastBuildDate>
	<generator>http://wordpress.org/?v=2.8.6</generator>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
		<item>
		<title>By: Björn Steinbrink</title>
		<link>http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/comment-page-1/#comment-452</link>
		<dc:creator>Björn Steinbrink</dc:creator>
		<pubDate>Mon, 23 Feb 2009 11:25:47 +0000</pubDate>
		<guid isPermaLink="false">http://techblog.floorplanner.com/?p=321#comment-452</guid>
		<description>Just a few remarks:

There&#039;s a bash completion script somewhere in git&#039;s contrib/ directory that has a more powerful function for showing the current branch in the prompt. For example, it can also tell you that you&#039;re in the middle of a rebase.

&quot;git checkout -b newbranch origin/newbranch&quot; is a purely local operation. IOW: The remote&#039;s branch is already available locally, in the remote tracking branch origin/newbranch. What the command does is just to create a local branch head from it (and it checks it out).

To actually get stuff that is not available locally yet, you need &quot;git fetch&quot; (defaults to &quot;git fetch origin&quot;).

And about &quot;rebase&quot;, that&#039;s rewriting history. If you share that branch with others (e.g. by pushing it to some remote repo), using rebase is a generally a bad idea. See &quot;RECOVERING FROM UPSTREAM REBASE&quot; in git-rebase(1).

And &quot;git branch -d -r origin/feature&quot; also deletes your local remote tracking branch, not the branch that exists in the remote repository, for that you&#039;d need &quot;git push origin :feature&quot;</description>
		<content:encoded><![CDATA[<p>Just a few remarks:</p>
<p>There&#8217;s a bash completion script somewhere in git&#8217;s contrib/ directory that has a more powerful function for showing the current branch in the prompt. For example, it can also tell you that you&#8217;re in the middle of a rebase.</p>
<p>&#8220;git checkout -b newbranch origin/newbranch&#8221; is a purely local operation. IOW: The remote&#8217;s branch is already available locally, in the remote tracking branch origin/newbranch. What the command does is just to create a local branch head from it (and it checks it out).</p>
<p>To actually get stuff that is not available locally yet, you need &#8220;git fetch&#8221; (defaults to &#8220;git fetch origin&#8221;).</p>
<p>And about &#8220;rebase&#8221;, that&#8217;s rewriting history. If you share that branch with others (e.g. by pushing it to some remote repo), using rebase is a generally a bad idea. See &#8220;RECOVERING FROM UPSTREAM REBASE&#8221; in git-rebase(1).</p>
<p>And &#8220;git branch -d -r origin/feature&#8221; also deletes your local remote tracking branch, not the branch that exists in the remote repository, for that you&#8217;d need &#8220;git push origin :feature&#8221;</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Gert-Jan</title>
		<link>http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/comment-page-1/#comment-224</link>
		<dc:creator>Gert-Jan</dc:creator>
		<pubDate>Sun, 14 Dec 2008 20:31:43 +0000</pubDate>
		<guid isPermaLink="false">http://techblog.floorplanner.com/?p=321#comment-224</guid>
		<description>Thanks for the post. I will need to improve my git skills asap. :-)</description>
		<content:encoded><![CDATA[<p>Thanks for the post. I will need to improve my git skills asap. <img src='http://techblog.floorplanner.com/wp-includes/images/smilies/icon_smile.gif' alt=':-)' class='wp-smiley' /> </p>
]]></content:encoded>
	</item>
</channel>
</rss>
