<?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>blog.felipebalbi.com &#187; GIT</title>
	<atom:link href="http://blog.felipebalbi.com/category/git-content-tracker/feed/" rel="self" type="application/rss+xml" />
	<link>http://blog.felipebalbi.com</link>
	<description>Felipe Balbi&#039;s Blog</description>
	<lastBuildDate>Wed, 12 May 2010 08:59:19 +0000</lastBuildDate>
	<generator>http://wordpress.org/?v=2.9.2</generator>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
			<item>
		<title>git&#8217;s goodies: git format-patch &#8211;cover-letter</title>
		<link>http://blog.felipebalbi.com/2008/03/27/gits-goodies-git-format-patch-cover-leter/</link>
		<comments>http://blog.felipebalbi.com/2008/03/27/gits-goodies-git-format-patch-cover-leter/#comments</comments>
		<pubDate>Thu, 27 Mar 2008 13:11:37 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>
		<category><![CDATA[cover-leter]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[patch]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=42</guid>
		<description><![CDATA[Sometimes we have to send patch series and it's always useful to add a cover letter (or cover email) explaining what your series is implementing/fixing.
Newest git (currently only on git's git tree) provides a new format-patch option to generate the cover leter for you. In the cover leter git adds shortlog and diffstat, you only [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2008/03/27/gits-goodies-git-format-patch-cover-leter/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>git-push and ssh-keys</title>
		<link>http://blog.felipebalbi.com/2008/01/03/git-push-and-ssh-keys/</link>
		<comments>http://blog.felipebalbi.com/2008/01/03/git-push-and-ssh-keys/#comments</comments>
		<pubDate>Thu, 03 Jan 2008 21:01:40 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[key]]></category>
		<category><![CDATA[ssh]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=41</guid>
		<description><![CDATA[Creating several ssh accounts for allowing push access to developers on a project is, at least, a waste of time and a possible security hole.
Instead of that, let's see how to manage such users using only one user "git" and several ssh-keys for allowing such push access.
 First of all, create only one user called [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2008/01/03/git-push-and-ssh-keys/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Housekeeping your git repository</title>
		<link>http://blog.felipebalbi.com/2007/12/19/housekeeping-your-git-repository/</link>
		<comments>http://blog.felipebalbi.com/2007/12/19/housekeeping-your-git-repository/#comments</comments>
		<pubDate>Wed, 19 Dec 2007 17:15:06 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=39</guid>
		<description><![CDATA[Housekeeping a git repository is useful to make it smaller and faster.  Git has a lot of tools to allow you optimizing your git repository. Let's take a look on a few of them and see what they do.

First we have to check where the "problems" are. To do this we use git-fsck:
$ git-fsck
dangling [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/12/19/housekeeping-your-git-repository/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Interactive git-rebase</title>
		<link>http://blog.felipebalbi.com/2007/09/04/interactive-git-rebase/</link>
		<comments>http://blog.felipebalbi.com/2007/09/04/interactive-git-rebase/#comments</comments>
		<pubDate>Tue, 04 Sep 2007 11:46:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=22</guid>
		<description><![CDATA[Hi all,
This will only be possible on git 1.5.3 and later versions (1.5.3 is the most recent at the time of this posting). With interactive rebase you can reorder your commits, meld them together, discard some commits, etc...
Let's see how to do it.
Story: You have 2 branches: master and exp. On exp you have a [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/09/04/interactive-git-rebase/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>&quot;git-cvsimport &#8211; Salvage your data out of another SCM people love to hate&quot;</title>
		<link>http://blog.felipebalbi.com/2007/08/29/git-cvsimport-salvage-your-data-out-of-another-scm-people-love-to-hate/</link>
		<comments>http://blog.felipebalbi.com/2007/08/29/git-cvsimport-salvage-your-data-out-of-another-scm-people-love-to-hate/#comments</comments>
		<pubDate>Wed, 29 Aug 2007 13:38:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=21</guid>
		<description><![CDATA[Hello all,
The title of this post came from git-cvsimport's man page. Let's try to use it??
NOTE: We're gonna need cvsps 2.1 or higher in order to split cvs log into patch sets.
Once you have the address of the cvs project you wanna import, you just issue:
$ git-cvsimport -d "CVSROOT" "CVS_module"
Example:
$ git-cvsimport -d \
   [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/29/git-cvsimport-salvage-your-data-out-of-another-scm-people-love-to-hate/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Solving merge conflicts with git</title>
		<link>http://blog.felipebalbi.com/2007/08/27/solving-merge-conflicts-with-git/</link>
		<comments>http://blog.felipebalbi.com/2007/08/27/solving-merge-conflicts-with-git/#comments</comments>
		<pubDate>Mon, 27 Aug 2007 11:51:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=20</guid>
		<description><![CDATA[Hello all,
After a lot of branching, merging, pulling, rebasing, etc we'll probably see some conflicts on the source code.
With this post we're gonna learn what's a conflicted merge and how to solve it.
Let's take a look:
Sometimes the merge can't be automatically resolved. When this happens, git leaves the index and working tree in such a [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/27/solving-merge-conflicts-with-git/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>git-checkout: Advanced use</title>
		<link>http://blog.felipebalbi.com/2007/08/15/git-checkout-advanced-use/</link>
		<comments>http://blog.felipebalbi.com/2007/08/15/git-checkout-advanced-use/#comments</comments>
		<pubDate>Wed, 15 Aug 2007 18:17:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=19</guid>
		<description><![CDATA[Hello all,
Yes, this post doesn't have a nice name... but let's go anyway:
1st tip: Using git-checkout to produce clean patches.
Assumptions: using that same 'exp' branch
Story: Let's say we're implementing a new driver in our 'exp' branch and we're committing even unbuildable code, of course, git lets us do it. But you won't send the whole [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/15/git-checkout-advanced-use/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>git-rebase 2: Applying comments to old commits (aka Modifying commits)</title>
		<link>http://blog.felipebalbi.com/2007/08/15/git-rebase-2-applying-comments-to-old-commits-aka-modifying-commits/</link>
		<comments>http://blog.felipebalbi.com/2007/08/15/git-rebase-2-applying-comments-to-old-commits-aka-modifying-commits/#comments</comments>
		<pubDate>Wed, 15 Aug 2007 16:16:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=18</guid>
		<description><![CDATA[Hi all,
we all know when we're working on public projects we'll always get our patches commented; so how to apply those comments and even though keep the patch-series order??
That's what we're learning today. Let's start?
NOTE: I'm assuming we're using the same 'exp' branch as on previous posts.
First of all we need to create a tag [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/15/git-rebase-2-applying-comments-to-old-commits-aka-modifying-commits/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>git-rebase: Updating a patch series</title>
		<link>http://blog.felipebalbi.com/2007/08/15/git-rebase-updating-a-patch-series/</link>
		<comments>http://blog.felipebalbi.com/2007/08/15/git-rebase-updating-a-patch-series/#comments</comments>
		<pubDate>Wed, 15 Aug 2007 16:08:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=17</guid>
		<description><![CDATA[Hi all,
It's getting harder and harder, isn't it?
Not at all  
Let's say we have an 'exp' branch where we're implementing a new feature for our project and, of course, committing there. Also, during our development, some interesting work has been done to branch origin (the remote master branch) of our project and we wanna [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/15/git-rebase-updating-a-patch-series/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Modifying the top-most commit</title>
		<link>http://blog.felipebalbi.com/2007/08/15/modifying-the-top-most-commit/</link>
		<comments>http://blog.felipebalbi.com/2007/08/15/modifying-the-top-most-commit/#comments</comments>
		<pubDate>Wed, 15 Aug 2007 16:04:00 +0000</pubDate>
		<dc:creator>Felipe Balbi</dc:creator>
				<category><![CDATA[GIT]]></category>

		<guid isPermaLink="false">http://felipebalbi.com/blog/?p=16</guid>
		<description><![CDATA[Hello all,
after a long, long time I'm back to show you how to modify the top-most commit.
Let's try it?
First of all, you just edit the file:
$ vim file.c-- Save and quit

$ git-add file.c$ git-commit --amend
And that's all. You're gonna commit the changes on the same commit you were.
Easy, isn't it?
On later post we'll see how [...]]]></description>
		<wfw:commentRss>http://blog.felipebalbi.com/2007/08/15/modifying-the-top-most-commit/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
