<?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>The Brian Olore Story &#187; git</title>
	<atom:link href="http://brian.olore.net/wp/tag/git/feed/" rel="self" type="application/rss+xml" />
	<link>http://brian.olore.net</link>
	<description>Less of a story, more of a brain dump</description>
	<lastBuildDate>Sun, 18 Dec 2011 17:19:51 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.3.1</generator>
		<item>
		<title>RailsConf &#8211; Day 1  &#8211; Git Immersion</title>
		<link>http://brian.olore.net/wp/2010/06/railsconf-day-1-git-immersion/</link>
		<comments>http://brian.olore.net/wp/2010/06/railsconf-day-1-git-immersion/#comments</comments>
		<pubDate>Mon, 07 Jun 2010 17:31:09 +0000</pubDate>
		<dc:creator>Brian</dc:creator>
				<category><![CDATA[work]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[railsconf]]></category>

		<guid isPermaLink="false">http://brian.olore.net/?p=130</guid>
		<description><![CDATA[Jim Weirich &#8211; @jimweirich If for some crazy reason you don&#8217;t already have git installed, go download it from here &#8211; http://git-scm.com/download Source Control Made Easy &#8211; Pragmatic Bookshelf Screen Cast git config &#8211;global user.name &#8220;Brian Olore&#8221; git config &#8211;global user.email &#8220;brian@olore.net&#8221; git config &#8211;global core.autocrlf input git init &#8211; creates a new, empty repository [...]]]></description>
			<content:encoded><![CDATA[<p>Jim Weirich &#8211; @jimweirich</p>
<p>If for some crazy reason you don&#8217;t already have git installed, go download it from here &#8211; <a href="http://news.bbc.co.uk/go/rss/-/2/hi/default.stm">http://git-scm.com/download</a></p>
<p>Source Control Made Easy &#8211; Pragmatic Bookshelf Screen Cast</p>
<p>git config &#8211;global user.name &#8220;Brian Olore&#8221;<br />
git config &#8211;global user.email &#8220;brian@olore.net&#8221;<br />
git config &#8211;global core.autocrlf input</p>
<p>git init &#8211; creates a new, empty repository</p>
<p>Git is about changes, not files.</p>
<p>Always additive &#8211; Information is never destroyed &#8211; makes it really really hard to screw up your repository</p>
<p>SHA1 used for preventing duplication &#8211; all files referenced using their hash<br />
- Is there additional meta-data that has things like executable flag, etc ??</p>
<p>Tags point to snapshots &amp; never move</p>
<p>Branches point to snapshots and move with commits<br />
Can branch <strong>after</strong> committing changes<br />
Cheap, local branches</p>
<p>git clone &lt;url&gt; &#8211; make an exact copy of remote working copy<br />
git pull &lt;url&gt; &#8211; receive changes from remote url into your working copy</p>
<p>Shared remote archive &#8211; allows sharing between many users &#8211; like svn, but if remote goes away, can still push/pull between users without the centralized repository</p>
<p>git log &#8211;pretty=oneline<br />
5e870f0441fb9a30ad2711e186cb46a1cafd9e30 pulling from command line<br />
63537c6c788c4893cf928509339f84cb9f243c6b First commit</p>
<p>git log &#8211;pretty=oneline &#8211;abbrev-commit<br />
5e870f0 pulling from command line<br />
63537c6 First commit</p>
<p>git add &#8211; adds the changes to be committed, not the file. Can have multiple adds</p>
<p>git diff &#8211; compare un-staged (things not yet &#8220;add&#8221;ed)<br />
git diff &#8211;cached &#8211; compare staged area (things &#8220;add&#8221;ed) to &#8220;commit&#8221;ted</p>
<p>Both <code>gitx</code> (for Macs) and <code>gitk</code> (any platform)  are useful in exploring log history.</p>
<p>git reset &#8211; changes a branch pointer</p>
<p>git reset &#8211;hard &#8211; changes the branch pointer and checks out into your working directory.</p>
<p>git rebase master &#8211; replays branch changes (rewrites commits) as if they happened on master</p>
<p>DO NOT rebase shared branches &#8211; only reset/rebase on local repositories</p>
<p>http:/nvie.com/git-model &#8211; &#8220;A successful Git branching model&#8221;</p>
]]></content:encoded>
			<wfw:commentRss>http://brian.olore.net/wp/2010/06/railsconf-day-1-git-immersion/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

