<?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: Git tracking branches</title>
	<atom:link href="http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/feed/" rel="self" type="application/rss+xml" />
	<link>http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/</link>
	<description>Just another LosTechies site</description>
	<lastBuildDate>Thu, 29 Mar 2012 20:33:00 +0000</lastBuildDate>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.4.2</generator>
	<item>
		<title>By: Jason Meridth</title>
		<link>http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/#comment-470</link>
		<dc:creator>Jason Meridth</dc:creator>
		<pubDate>Wed, 24 Mar 2010 16:09:37 +0000</pubDate>
		<guid isPermaLink="false">/blogs/jason_meridth/archive/2010/03/23/git-tracking-branches.aspx#comment-470</guid>
		<description>@Roger

I&#039;ll work on it tonight.

In the mean-time just understand that:

&quot;git diff&quot; compares your working directory and index/staging
&quot;git diff --staged&quot; compares your index/staging to your local repository (committed files)
&quot;git diff HEAD&quot; compares your local reponsitory (committed files) to your working directory

http://book.git-scm.com/3_comparing_commits_-_git_diff.html
http://kernel.org/pub/software/scm/git/docs/git-diff.html

This is not to be read as a RTFM.  I&#039;ll write the post tonight.</description>
		<content:encoded><![CDATA[<p>@Roger</p>
<p>I&#8217;ll work on it tonight.</p>
<p>In the mean-time just understand that:</p>
<p>&#8220;git diff&#8221; compares your working directory and index/staging<br />
&#8220;git diff &#8211;staged&#8221; compares your index/staging to your local repository (committed files)<br />
&#8220;git diff HEAD&#8221; compares your local reponsitory (committed files) to your working directory</p>
<p><a href="http://book.git-scm.com/3_comparing_commits_-_git_diff.html" rel="nofollow">http://book.git-scm.com/3_comparing_commits_-_git_diff.html</a><br />
<a href="http://kernel.org/pub/software/scm/git/docs/git-diff.html" rel="nofollow">http://kernel.org/pub/software/scm/git/docs/git-diff.html</a></p>
<p>This is not to be read as a RTFM.  I&#8217;ll write the post tonight.</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Roger Pence</title>
		<link>http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/#comment-469</link>
		<dc:creator>Roger Pence</dc:creator>
		<pubDate>Wed, 24 Mar 2010 15:42:09 +0000</pubDate>
		<guid isPermaLink="false">/blogs/jason_meridth/archive/2010/03/23/git-tracking-branches.aspx#comment-469</guid>
		<description>Jason--Thanks for turning me on to Git at our local user group meeting a while back. How about writing a little about doing diffs with Git. I&#039;ve pretty much made friends with everything else, but diffs (both at the commit and file level) sometimes drive me nuts. 

Thanks
rp</description>
		<content:encoded><![CDATA[<p>Jason&#8211;Thanks for turning me on to Git at our local user group meeting a while back. How about writing a little about doing diffs with Git. I&#8217;ve pretty much made friends with everything else, but diffs (both at the commit and file level) sometimes drive me nuts. </p>
<p>Thanks<br />
rp</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Jason Meridth</title>
		<link>http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/#comment-468</link>
		<dc:creator>Jason Meridth</dc:creator>
		<pubDate>Wed, 24 Mar 2010 01:11:39 +0000</pubDate>
		<guid isPermaLink="false">/blogs/jason_meridth/archive/2010/03/23/git-tracking-branches.aspx#comment-468</guid>
		<description>@Jim

I use the -t/--track command too.  I, unfortunately, have local branches from my git beginnings that weren&#039;t tracked and wanted to post this info in case anyone else comes across it.

I agree the refspec format seems arcane.

I didn&#039;t know that checkout was wired to create a local tracking branch automatically now in 1.7.  I&#039;m going to play with that tonight.

Thanks for the additional information.</description>
		<content:encoded><![CDATA[<p>@Jim</p>
<p>I use the -t/&#8211;track command too.  I, unfortunately, have local branches from my git beginnings that weren&#8217;t tracked and wanted to post this info in case anyone else comes across it.</p>
<p>I agree the refspec format seems arcane.</p>
<p>I didn&#8217;t know that checkout was wired to create a local tracking branch automatically now in 1.7.  I&#8217;m going to play with that tonight.</p>
<p>Thanks for the additional information.</p>
]]></content:encoded>
	</item>
	<item>
		<title>By: Jim Raden</title>
		<link>http://lostechies.com/jasonmeridth/2010/03/23/git-tracking-branches/#comment-467</link>
		<dc:creator>Jim Raden</dc:creator>
		<pubDate>Wed, 24 Mar 2010 00:55:24 +0000</pubDate>
		<guid isPermaLink="false">/blogs/jason_meridth/archive/2010/03/23/git-tracking-branches.aspx#comment-467</guid>
		<description>The &quot;helpful&quot; Git message is a few versions behind, I think, rendering it less helpful. Perhaps you have just inspired a bug report.  :)

The refspec format frankly scares me. Even for Git it looks arcane.

I prefer the following, which sets up the local branch to track the remote branch:

$ git branch -t branchname remotename/branchname

Note: if &quot;branchname&quot; already exists locally, you may have to add an &quot;-f&quot; as another parameter, I believe before the branch name.

And very recently (1.7?) they added the a nifty feature to the checkout command:

$ git checkout branchname

If &quot;branchname&quot; is not already a local branch, it automatically creates a tracking branch with that name. Cool, eh?</description>
		<content:encoded><![CDATA[<p>The &#8220;helpful&#8221; Git message is a few versions behind, I think, rendering it less helpful. Perhaps you have just inspired a bug report.  :)</p>
<p>The refspec format frankly scares me. Even for Git it looks arcane.</p>
<p>I prefer the following, which sets up the local branch to track the remote branch:</p>
<p>$ git branch -t branchname remotename/branchname</p>
<p>Note: if &#8220;branchname&#8221; already exists locally, you may have to add an &#8220;-f&#8221; as another parameter, I believe before the branch name.</p>
<p>And very recently (1.7?) they added the a nifty feature to the checkout command:</p>
<p>$ git checkout branchname</p>
<p>If &#8220;branchname&#8221; is not already a local branch, it automatically creates a tracking branch with that name. Cool, eh?</p>
]]></content:encoded>
	</item>
</channel>
</rss>
