<?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>Internet Strategy Guide &#187; ubuntu</title>
	<atom:link href="http://phpprotip.com/tag/ubuntu/feed/" rel="self" type="application/rss+xml" />
	<link>http://phpprotip.com</link>
	<description>Together we can defeat the internet</description>
	<lastBuildDate>Tue, 08 Nov 2011 06:19:18 +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>tekx &#8211; getting git</title>
		<link>http://phpprotip.com/2010/05/tekx-getting-git/</link>
		<comments>http://phpprotip.com/2010/05/tekx-getting-git/#comments</comments>
		<pubDate>Wed, 19 May 2010 20:50:29 +0000</pubDate>
		<dc:creator>chance</dc:creator>
				<category><![CDATA[phptek]]></category>
		<category><![CDATA[tekx]]></category>
		<category><![CDATA[version control]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[Mac OS X]]></category>
		<category><![CDATA[Microsoft Windows]]></category>
		<category><![CDATA[Revision control]]></category>
		<category><![CDATA[ubuntu]]></category>

		<guid isPermaLink="false">http://phpprotip.com/?p=240</guid>
		<description><![CDATA[Image of Travis Swicegood @tswicegood's talk is for people who aren't familiar with git or version control. They won't be delving into the the internals. Installation of git for ubuntu can be done with apt. If I heard correctly (busy setting up to blog), Windows installation will require cygwin. OSX can be done with homebrew. [...]]]></description>
			<content:encoded><![CDATA[<div class="zemanta-img" style="margin: 1em; display: block;">
<div>
<dl class="wp-caption alignright" style="width: 58px;">
<dt class="wp-caption-dt"><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3R3aXR0ZXIuY29tL3Rzd2ljZWdvb2Q="><img title="Image of Travis Swicegood from Twitter" src="http://phpprotip.com/wp-content/uploads/2010/05/me-square_normal__normal.jpg" alt="Image of Travis Swicegood from Twitter" width="48" height="48" /></a></dt>
<dd class="wp-caption-dd zemanta-img-attribution" style="font-size: 0.8em;">Image of <a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3R3aXR0ZXIuY29tL3Rzd2ljZWdvb2Q=">Travis Swicegood</a></dd>
</dl>
</div>
</div>
<p>@tswicegood's talk is for people who aren't familiar with <a class=\"zem_slink freebase/en/git\" title=\"Git (software)\" rel=\"homepage\" href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL2dpdC1zY20uY29tLw==">git</a> or version control. They won't be delving into the the internals.</p>
<p>Installation of git for ubuntu can be done with apt. If I heard correctly (busy setting up to blog), <a class=\"zem_slink freebase/en/microsoft_windows\" title=\"Windows\" rel=\"homepage\" href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL1dJTkRPV1M=">Windows</a> installation will require cygwin. <a class=\"zem_slink freebase/en/mac_os_x\" title=\"Mac OS X\" rel=\"homepage\" href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL2FwcGxlLmNvbS9tYWNvc3gv">OSX</a> can be done with homebrew. Be sure to verify the install no matter which installation method you. One thing to keep in mind about git is that it started out on the command line and will always be heavily entrenched there. So hopefully your team is comfortable with that.</p>
<p>When you start using git, you should set up your user and email. Config also allows you to enable colors.</p>
<p><span id="more-240"></span></p>
<p>To create a repository, you call "git init" from the command prompt. The repository is created in a hidden directory and you create a directory for your working tree(if I understood correctly). Git allows you to clone a repository with the clone command.</p>
<p>There is an area called "Index" that @tswicegood calls the "Staging Area". This area allows you to commit specific changes separately. Seems like the flow is like what I'm use to with <a class=\"zem_slink freebase/guid/9202a8c04000641f8000000000d78871\" title=\"Bazaar (software)\" rel=\"homepage\" href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL2JhemFhci5jYW5vbmljYWwuY29t">Bazaar</a> (bzr) where you check status, add files if needed, then commit. Instead of version numbers, git uses sha1 hashes based on the config and time.</p>
<p>Once difference to bzr is that you need to add the file again in order to commit changes you want. You can provide the file as a parameter to commit command or you can use the -a flag to commit all the known working tree changes. Using the -p flag with the add command (git add -p foo.txt), you can get the diff.</p>
<p>Removing a new file can be done with "git rm --cached foo.txt". Moving files can be done by moving them yourself or you can also do "git mv" to rename. Deleting a file is "git rm" without the --cached flag.</p>
<p>sending changes is done with push command. Something to do with 'origin' and 'master' which should be covered later?</p>
<p>So far the only real advantage I'm seeing over Bazaar is the staging area which I do with my branching strategy already. Apparently in git, a branch is just a pointer to a particular commit somewhere in the repository.</p>
<p>Git can do a merge by recursion. He's blasting through some of the branch info to get to team work. Talking about rebasing which seems crazy and dangerous. Remotes seem interesting and easy to set up. Fetching changes are how you can populate the remote branch. Once you fetch changes, you still have to merge.This brings us back to the pull command which allows you to fetch and merge.</p>
<p>Refspec at its simplest is a single branch. You can rebase as part of a pull by giving the --rebase flag. Refspec when pushing is flipped (local then remote).</p>
<p>A lot of information to take in, going to look into it more later. Looks pretty flexible.</p>
<h6 class="zemanta-related-title" style="font-size: 1em;">Related articles by Zemanta</h6>
<ul class="zemanta-article-ul">
<li class="zemanta-article-ul-li"><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3d3dy5zbGlkZXNoYXJlLm5ldC9sYWNobGFuaGFyZHkvaW1wcm92ZS15b3VyLWRldmVsb3BtZW50LXByb2Nlc3Mtd2l0aC1naXQ=">Improve Your Development Process with Git</a> (slideshare.net)</li>
<li class="zemanta-article-ul-li"><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3llaHVkYWthdHouY29tLzIwMTAvMDUvMTMvY29tbW9uLWdpdC13b3JrZmxvd3Mv">My Common Git Workflow</a> (yehudakatz.com)</li>
<li class="zemanta-article-ul-li"><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3JlcHJvZy53b3JkcHJlc3MuY29tLzIwMTAvMDUvMTIvc3RpbGwtaGF0aW4tb24tZ2l0LW5vdy13aXRoLWFkZGVkLWFjdHVhbC1yZWFzb25zLw==">Still hatin' on git: now with added Actual Reasons</a> (reprog.wordpress.com)</li>
<li class="zemanta-article-ul-li"><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3d3dy5zbGlkZXNoYXJlLm5ldC90aW01MTgvbG92aW5nLWdpdDI=">Loving Git[2]</a> (slideshare.net)</li>
</ul>
<div class="zemanta-pixie" style="margin-top: 10px; height: 15px;"><a class=\"zemanta-pixie-a\" title=\"Reblog this post [with Zemanta]\" href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3JlYmxvZy56ZW1hbnRhLmNvbS96ZW1pZmllZC80MmU4N2QyOC0wMmRjLTRlMTMtYTkxOC02MTgzMzBkOGJmNDMv"><img class="zemanta-pixie-img" style="border: medium none; float: right;" src="http://img.zemanta.com/reblog_a.png?x-id=42e87d28-02dc-4e13-a918-618330d8bf43" alt="Reblog this post [with Zemanta]" /></a><span class="zem-script more-related more-info pretty-attribution"><script src="http://static.zemanta.com/readside/loader.js" type="text/javascript"></script></span></div>
 <img src="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?view=1&post_id=240" width="1" height="1" style="display: none;" />]]></content:encoded>
			<wfw:commentRss>http://phpprotip.com/2010/05/tekx-getting-git/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Installing Citrix client onto Ubuntu 64-bit</title>
		<link>http://phpprotip.com/2009/01/installing-citrix-client-onto-ubuntu-64-bit/</link>
		<comments>http://phpprotip.com/2009/01/installing-citrix-client-onto-ubuntu-64-bit/#comments</comments>
		<pubDate>Mon, 12 Jan 2009 20:04:30 +0000</pubDate>
		<dc:creator>chance</dc:creator>
				<category><![CDATA[*nix]]></category>
		<category><![CDATA[citrix]]></category>
		<category><![CDATA[linux]]></category>
		<category><![CDATA[ubuntu]]></category>
		<category><![CDATA[ubuntu 64]]></category>
		<category><![CDATA[ubuntu 64-bit]]></category>
		<category><![CDATA[ubuntu 64bit]]></category>

		<guid isPermaLink="false">http://phpprotip.com/?p=109</guid>
		<description><![CDATA[Recently at work, I was told to install the citrix client. This was fine since citrix has a linux install, which did not work or spit out any error message. After 68 tabs (not exaggerating) worth of googling, I found the reason for this was that citrix hates freedom only works on 32bit linux and [...]]]></description>
			<content:encoded><![CDATA[<p>Recently at work, I was told to install the citrix client. This was fine since citrix has a linux install, which did not work or spit out any error message.  After 68 tabs (not exaggerating) worth of googling, I found the reason for this was that citrix <del datetime="2009-01-12T19:58:12+00:00">hates freedom</del> only works on 32bit linux and that there is no 64bit version out yet. YAY! after a couple thousand (exaggerating) more tabs, I was able to track down the correct way to <a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cHM6Ly93aWtpLnVidW50dS5jb20vSW5zdGFsbGluZ0NpdHJpeA==">install citrix onto ubuntu 64-bit</a>.</p>
 <img src="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?view=1&post_id=109" width="1" height="1" style="display: none;" />]]></content:encoded>
			<wfw:commentRss>http://phpprotip.com/2009/01/installing-citrix-client-onto-ubuntu-64-bit/feed/</wfw:commentRss>
		<slash:comments>1</slash:comments>
		</item>
		<item>
		<title>wordle meme</title>
		<link>http://phpprotip.com/2008/12/wordle-meme/</link>
		<comments>http://phpprotip.com/2008/12/wordle-meme/#comments</comments>
		<pubDate>Fri, 19 Dec 2008 14:14:01 +0000</pubDate>
		<dc:creator>chance</dc:creator>
				<category><![CDATA[meme]]></category>
		<category><![CDATA[ubuntu]]></category>
		<category><![CDATA[wordle]]></category>

		<guid isPermaLink="false">http://phpprotip.com/?p=91</guid>
		<description><![CDATA[Joining the wordle meme late in the game because I just got ff java plugin to work.]]></description>
			<content:encoded><![CDATA[<p><a href="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?url=aHR0cDovL3d3dy53b3JkbGUubmV0L2dhbGxlcnkvd3JkbC8zOTg1NzYvcGhwcHJvdGlwLmNvbQ==" title=\"Wordle: phpprotip.com\"><img src="http://phpprotip.com/wp-content/uploads/2008/12/screenshot-wordle-phpprotipcom-mozilla-firefox-300x186.png" alt="" title="wordle meme" width="300" height="186" class="alignnone size-medium wp-image-90" /></a></p>
<p>Joining the wordle meme late in the game because I just got ff java plugin to work.</p>
 <img src="http://phpprotip.com/wp-content/plugins/wordpress-feed-statistics/feed-statistics.php?view=1&post_id=91" width="1" height="1" style="display: none;" />]]></content:encoded>
			<wfw:commentRss>http://phpprotip.com/2008/12/wordle-meme/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>

