<?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>Tom Sartain &#124; Blog &#187; reference</title>
	<atom:link href="http://blog.ummwhat.com/category/reference/feed/" rel="self" type="application/rss+xml" />
	<link>http://blog.ummwhat.com</link>
	<description></description>
	<lastBuildDate>Fri, 20 Aug 2010 02:00:31 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	<generator>http://wordpress.org/?v=3.0</generator>
		<item>
		<title>Dec 11 OSX System Update broke Java, and I had to fix it again</title>
		<link>http://blog.ummwhat.com/2009/12/dec-11-osx-system-update-broke-java-and-i-had-to-fix-it-again/</link>
		<comments>http://blog.ummwhat.com/2009/12/dec-11-osx-system-update-broke-java-and-i-had-to-fix-it-again/#comments</comments>
		<pubDate>Mon, 14 Dec 2009 16:40:23 +0000</pubDate>
		<dc:creator>Tom</dc:creator>
				<category><![CDATA[osx]]></category>
		<category><![CDATA[reference]]></category>

		<guid isPermaLink="false">http://blog.ummwhat.com/?p=3439</guid>
		<description><![CDATA[Upgrading from OSX 10.5 Leopard to OSX 10.6 Snow Leopard had some unexpected consequences for the Java installation, basically ditching Java 1.5 and only having Java 1.6. I would think most Java based apps would be fine with an upgrade, but, then again, I&#8217;m not a Java man. I found that Zend Studio had some [...]]]></description>
			<content:encoded><![CDATA[<p>Upgrading from OSX 10.5 Leopard to OSX 10.6 Snow Leopard had some unexpected consequences for the Java installation, basically ditching Java 1.5 and only having Java 1.6. I would think most Java based apps would be fine with an upgrade, but, then again, I&#8217;m not a Java man. </p>
<p>I found that Zend Studio had some strange issues when starting up (it didn&#8217;t) and the answer was to get the original OSX 10.5 Java 1.5 and put it back where it could be used and do some finagling with settings to let applications use it. It&#8217;s all spelled out in this article on <a href="http://wiki.oneswarm.org/index.php/OS_X_10.6_Snow_Leopard">how to fix Snow Leopard&#8217;s Java Problem</a></p>
<p>After this past friday&#8217;s software update though, it happened again. After a little bit of research and some trial and error, I found out that I had to re-do a part of the previous fix.</p>
<p>Specifically, I had to re-update the symlink for 1.5.0 in /System/Library/Frameworks/JavaVM.framework/Versions so it was pointed at my 1.5.0-leopard folder. I&#8217;m not sure if I&#8217;ll need to update my other 1.5 related folder to <strong>not</strong> point to the CurrentJDK. </p>
<p>My /System/Library/Frameworks/JavaVM.framework/Versions directory now looks like this:</p>
<pre>
1.3        -> 1.3.1
1.3.1
1.4        -> CurrentJDK
1.4.2      -> CurrentJDK
1.5        -> CurrentJDK
1.5.0      -> 1.5.0-leopard
1.5.0-leopard
1.6        -> 1.6.0
1.6.0
A
Current    -> A
CurrentJDK -> 1.6
</pre>
<p>All of these were updated on Dec 11 when I did the update. So a quick</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;"><span style="color: #c20cb9; font-weight: bold;">sudo</span> <span style="color: #c20cb9; font-weight: bold;">ln</span> <span style="color: #660033;">-snf</span> 1.5.0-leopard 1.5.0</pre></div></div>

<p>And things were good.</p>
]]></content:encoded>
			<wfw:commentRss>http://blog.ummwhat.com/2009/12/dec-11-osx-system-update-broke-java-and-i-had-to-fix-it-again/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Firefox Bookmarks Corruption</title>
		<link>http://blog.ummwhat.com/2009/11/firefox-bookmarks-corruption/</link>
		<comments>http://blog.ummwhat.com/2009/11/firefox-bookmarks-corruption/#comments</comments>
		<pubDate>Mon, 23 Nov 2009 01:30:44 +0000</pubDate>
		<dc:creator>Tom</dc:creator>
				<category><![CDATA[reference]]></category>
		<category><![CDATA[firefox]]></category>
		<category><![CDATA[sqlite]]></category>

		<guid isPermaLink="false">http://blog.ummwhat.com/?p=3415</guid>
		<description><![CDATA[I&#8217;d noticed that my Firefox bookmarking was acting wonky. When I tried to bookmark a page, the form would pre-populate with an existing bookmark and upon saving, would save a new bookmark with the old bookmark&#8217;s information. Not quite what it should have been doing. Using the built-in bookmark manager was useless since there seemed [...]]]></description>
			<content:encoded><![CDATA[<p>I&#8217;d noticed that my Firefox bookmarking was acting wonky. When I tried to bookmark a page, the form would pre-populate with an existing bookmark and upon saving, would save a new bookmark with the old bookmark&#8217;s information. Not quite what it should have been doing. </p>
<p>Using the built-in bookmark manager was useless since there seemed to be an underlying problem with the SQLite database Firefox uses, so I tried opening up the database using the excellent <a href="https://addons.mozilla.org/en-US/firefox/addon/5817">SQLite Manager Add on for Firefox</a>. By running the <a href="http://www.sqlite.org/pragma.html#debug">PRAGMA integrity_check command</a> I saw that the database disk image is malformed. Uh oh.</p>
<p>It had to be rebuilt.</p>
<p>First, I had to make sure I had a <a href="http://www.sqlite.org/download.html">SQLite Command Line Client</a> because I wouldn&#8217;t really be able to work on Firefox&#8217;s databases from inside Firefox.</p>
<p>Then I navigated over to where my places.sqlite database file inside my Firefox profile (which, for me was ~/Library/Application Support/Firefox/Profiles/{profile_name} )</p>
<p>I &#8216;connected&#8217; to my SQLite database</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">sqlite3 places.sqlite</pre></div></div>

<p>I reran the integrity check to see if I could garner more information</p>

<div class="wp_syntax"><div class="code"><pre class="sql" style="font-family:monospace;">PRAGMA integrity_check;</pre></div></div>

<p>Which told me some more information that I didn&#8217;t know about</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">On page <span style="color: #000000;">11</span> at right child: 2nd reference to page <span style="color: #000000;">1609</span>
rowid <span style="color: #000000;">912</span> missing from index moz_bookmarks_itemlastmodifiedindex
SQL error: database disk image is malformed</pre></div></div>

<p>I&#8217;d read that doing a straightforward dump/reload of the data should fix this sort of problem, so exited out of the SQLite shell and did a <a href="http://www.sqlite.org/sqlite.html">dump from SQLite</a></p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">sqlite3 places.sqlite .dump <span style="color: #000000; font-weight: bold;">&gt;</span> places.sql</pre></div></div>

<p>Followed by load into a new SQLite database</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">sqlite3 places.new.sqlite <span style="color: #000000; font-weight: bold;">&lt;</span> places.sql</pre></div></div>

<p>But then I got a bunch of primary key errors</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">SQL error near line <span style="color: #000000;">872</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">877</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">883</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">884</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">885</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">888</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">889</span>: PRIMARY KEY must be unique
SQL error near line <span style="color: #000000;">890</span>: PRIMARY KEY must be unique</pre></div></div>

<p>I popped open places.sql and checked out the lines in question. I saw what appeared to be the primary key which had stopped logically increasing and was sort of random</p>

<div class="wp_syntax"><div class="code"><pre class="sql" style="font-family:monospace;"><span style="color: #993333; font-weight: bold;">INSERT</span> <span style="color: #993333; font-weight: bold;">INTO</span> <span style="color: #ff0000;">&quot;moz_bookmarks&quot;</span> <span style="color: #993333; font-weight: bold;">VALUES</span><span style="color: #66cc66;">&#40;</span><span style="color: #cc66cc;">915</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">16546</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">2</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">110</span><span style="color: #66cc66;">,</span><span style="color: #ff0000;">'Bookmark Page Name #1'</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1256413281706712</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1256413281711799</span><span style="color: #66cc66;">&#41;</span>;
<span style="color: #993333; font-weight: bold;">INSERT</span> <span style="color: #993333; font-weight: bold;">INTO</span> <span style="color: #ff0000;">&quot;moz_bookmarks&quot;</span> <span style="color: #993333; font-weight: bold;">VALUES</span><span style="color: #66cc66;">&#40;</span><span style="color: #cc66cc;">29</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">33509</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">2</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">135</span><span style="color: #66cc66;">,</span><span style="color: #ff0000;">'Bookmark Page Name #2'</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1258662433785621</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">&#41;</span>;
<span style="color: #993333; font-weight: bold;">INSERT</span> <span style="color: #993333; font-weight: bold;">INTO</span> <span style="color: #ff0000;">&quot;moz_bookmarks&quot;</span> <span style="color: #993333; font-weight: bold;">VALUES</span><span style="color: #66cc66;">&#40;</span><span style="color: #cc66cc;">28</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">31347</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">27</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">0</span><span style="color: #66cc66;">,</span><span style="color: #ff0000;">'Bookmark Page Name #3'</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1258472420957472</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">&#41;</span>;
<span style="color: #993333; font-weight: bold;">INSERT</span> <span style="color: #993333; font-weight: bold;">INTO</span> <span style="color: #ff0000;">&quot;moz_bookmarks&quot;</span> <span style="color: #993333; font-weight: bold;">VALUES</span><span style="color: #66cc66;">&#40;</span><span style="color: #cc66cc;">27</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">2</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">2</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">134</span><span style="color: #66cc66;">,</span><span style="color: #ff0000;">'Bookmark Page Name #4'</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">,</span><span style="color: #ff0000;">''</span><span style="color: #66cc66;">,</span><span style="color: #cc66cc;">1258472420951405</span><span style="color: #66cc66;">,</span><span style="color: #993333; font-weight: bold;">NULL</span><span style="color: #66cc66;">&#41;</span>;</pre></div></div>

<p>After a cursory glance through the rest of the file, I figured that I could change those primary keys to whatever I wanted as long as they were unique. A quick run through with that, running the same code as before</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">sqlite3 places.new.sqlite <span style="color: #000000; font-weight: bold;">&lt;</span> places.sql</pre></div></div>

<p>And success! I renamed my new places.new.sqlite to replace my old places.sqlite, restarted Firefox and everything worked out hunky dory.</p>
<p>A few notes:</p>
<ul>
<li>Make sure Firefox is completely closed before attempting to do anything with the databases from the command line. You will get errors about the database being locked</li>
<li>After restarting Firefox, I did notice issues with my AwesomeBar not quite remembering my usual auto-complete and I also had to click through all of the items in my toolbar in order to get the favicons showing again, but so far nothing major</li>
</ul>
</pre>
]]></content:encoded>
			<wfw:commentRss>http://blog.ummwhat.com/2009/11/firefox-bookmarks-corruption/feed/</wfw:commentRss>
		<slash:comments>1</slash:comments>
		</item>
		<item>
		<title>Timing command line functions</title>
		<link>http://blog.ummwhat.com/2009/11/timing-command-line-functions/</link>
		<comments>http://blog.ummwhat.com/2009/11/timing-command-line-functions/#comments</comments>
		<pubDate>Mon, 16 Nov 2009 18:08:46 +0000</pubDate>
		<dc:creator>Tom</dc:creator>
				<category><![CDATA[osx]]></category>
		<category><![CDATA[reference]]></category>

		<guid isPermaLink="false">http://blog.ummwhat.com/?p=3404</guid>
		<description><![CDATA[Yet another basic command line tool that is awesome: time This lets you do a quick and dirty profile on some code you&#8217;re executing. Basic Usage time &#60;command&#62; This will execute the command and put out a summary detailing how long the command took in total, how long it was tied up in actual execution, [...]]]></description>
			<content:encoded><![CDATA[<p>Yet another basic command line tool that is awesome:</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;"><span style="color: #000000; font-weight: bold;">time</span></pre></div></div>

<p>This lets you do a quick and dirty profile on some code you&#8217;re executing.</p>
<p><strong>Basic Usage</strong></p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;"><span style="color: #000000; font-weight: bold;">time</span> <span style="color: #000000; font-weight: bold;">&lt;</span><span style="color: #7a0874; font-weight: bold;">command</span><span style="color: #000000; font-weight: bold;">&gt;</span></pre></div></div>

<p>This will execute the command and put out a summary detailing how long the command took in total, how long it was tied up in actual execution, and how long it was tied up in system overhead:</p>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">real	0m0.031s
user	0m0.004s
sys	0m0.023s</pre></div></div>

<p>Another nifty function that does one thing and one thing only, but does it well. Thanks Unix philosophy!</p>
]]></content:encoded>
			<wfw:commentRss>http://blog.ummwhat.com/2009/11/timing-command-line-functions/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Web Safe Fonts</title>
		<link>http://blog.ummwhat.com/2009/09/web-safe-fonts/</link>
		<comments>http://blog.ummwhat.com/2009/09/web-safe-fonts/#comments</comments>
		<pubDate>Wed, 02 Sep 2009 19:33:22 +0000</pubDate>
		<dc:creator>Tom</dc:creator>
				<category><![CDATA[reference]]></category>
		<category><![CDATA[webdev]]></category>
		<category><![CDATA[css]]></category>
		<category><![CDATA[fonts]]></category>

		<guid isPermaLink="false">http://blog.ummwhat.com/?p=3337</guid>
		<description><![CDATA[Windows fonts / Mac fonts / Font family Arial, Arial, Helvetica, sans-serif Arial Black, Arial Black, Gadget, sans-serif Comic Sans MS, Comic Sans MS, cursive Courier New, Courier New, Courier, monospace Georgia, Georgia, serif Impact, Impact, Charcoal, sans-serif Lucida Console, Monaco, monospace Lucida Sans Unicode, Lucida Grande, sans-serif Palatino Linotype, Book Antiqua, Palatino, serif Tahoma, [...]]]></description>
			<content:encoded><![CDATA[<table>
<caption>Windows fonts / <span class="mac">Mac fonts</span> / <em>Font family</em></caption>
<tbody>
<tr style="font-family: Arial,Helvetica,sans-serif;">
<td>Arial, <span class="mac">Arial, Helvetica</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'Arial Black',Gadget,sans-serif;">
<td>Arial Black, <span class="mac">Arial Black, Gadget</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'Comic Sans MS',Textile,cursive;">
<td>Comic Sans MS, <span class="mac">Comic Sans MS</span>, <em>cursive</em></td>
</tr>
<tr style="font-family: 'Courier New',Courier,monospace;">
<td>Courier New, <span class="mac">Courier New, Courier</span>, <em>monospace</em></td>
</tr>
<tr style="font-family: Georgia,'Times New Roman',Times,serif;">
<td>Georgia, <span class="mac">Georgia</span>, <em>serif</em></td>
</tr>
<tr style="font-family: Impact,Charcoal,sans-serif;">
<td>Impact, <span class="mac">Impact, Charcoal</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'Lucida Console',Monaco,monospace;">
<td>Lucida Console, <span class="mac">Monaco</span>, <em>monospace</em></td>
</tr>
<tr style="font-family: 'Lucida Sans Unicode','Lucida Grande',sans-serif;">
<td>Lucida Sans Unicode, <span class="mac">Lucida Grande</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'Palatino Linotype','Book Antiqua',Palatino,serif;">
<td>Palatino Linotype, Book Antiqua, <span class="mac">Palatino</span>, <em>serif</em></td>
</tr>
<tr style="font-family: Tahoma,Geneva,sans-serif;">
<td>Tahoma, <span class="mac">Geneva</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'Times New Roman',Times,serif;">
<td>Times New Roman, <span class="mac">Times</span>, <em>serif</em></td>
</tr>
<tr style="font-family: 'Trebuchet MS',Helvetica,sans-serif;">
<td>Trebuchet MS, <span class="mac">Helvetica</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: Verdana,Geneva,sans-serif;">
<td>Verdana, <span class="mac">Verdana, Geneva</span>, <em>sans-serif</em></td>
</tr>
<tr class="symbol" style="font-family: Symbol;">
<td>Symbol, <span class="mac">Symbol</span> <span style="font-family: Verdana; white-space: nowrap;">(Symbol, <span class="mac">Symbol</span>)</span></td>
</tr>
<tr class="symbol" style="font-family: Webdings;">
<td>Webdings, <span class="mac">Webdings</span> <span style="font-family: Verdana; white-space: nowrap;">(Webdings, <span class="mac">Webdings</span>)</span></td>
</tr>
<tr class="symbol" style="font-family: Wingdings,'Zapf Dingbats';">
<td>Wingdings, <span class="mac">Zapf Dingbats</span> <span style="font-family: Verdana; white-space: nowrap;">(Wingdings, <span class="mac">Zapf Dingbats</span>)</span></td>
</tr>
<tr style="font-family: 'MS Sans Serif',Geneva,sans-serif;">
<td>MS Sans Serif, <span class="mac">Geneva</span>, <em>sans-serif</em></td>
</tr>
<tr style="font-family: 'MS Serif','New York',serif;">
<td>MS Serif, <span class="mac">New York</span>, <em>serif</em></td>
</tr>
</tbody>
</table>
<p>Lifted from <a href="http://www.ampsoft.net/webdesign-l/WindowsMacFonts.html">http://www.ampsoft.net/webdesign-l/WindowsMacFonts.html</a></p>
]]></content:encoded>
			<wfw:commentRss>http://blog.ummwhat.com/2009/09/web-safe-fonts/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
		<item>
		<title>Git and SVN Notes</title>
		<link>http://blog.ummwhat.com/2009/08/git-and-svn-notes/</link>
		<comments>http://blog.ummwhat.com/2009/08/git-and-svn-notes/#comments</comments>
		<pubDate>Thu, 27 Aug 2009 16:27:44 +0000</pubDate>
		<dc:creator>Tom</dc:creator>
				<category><![CDATA[reference]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[git-svn]]></category>
		<category><![CDATA[svn]]></category>

		<guid isPermaLink="false">http://blog.ummwhat.com/?p=109</guid>
		<description><![CDATA[More for my own reference than anything else&#8230; I have an SVN repository cloned locally. I&#8217;ve made a couple of changes in order for my application to run locally and I committed those all against the &#8220;dev&#8221; branch I set up. I then go off and do some actual work, which then needs to get [...]]]></description>
			<content:encoded><![CDATA[<p>More for my own reference than anything else&#8230;</p>
<p>I have an SVN repository cloned locally. I&#8217;ve made a couple of changes in order for my application to run locally and I committed those all against the &#8220;dev&#8221; branch I set up. </p>
<p>I then go off and do some actual work, which then needs to get sent back upstream to SVN. This is my workflow.</p>
<p>Starting in the dev branch, with all of my changes committed&#8230;</p>
<ol class="code_instruction">
<li>
<div>Because I should be making sure I have the newest stuff from SVN, just in case</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git <span style="color: #c20cb9; font-weight: bold;">svn</span> rebase</pre></div></div>

</li>
<li>
<div>Switch over to the master, which should mimic SVN</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git checkout master</pre></div></div>

</li>
<li>
<div>Bring master up to date with the dev branch</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git rebase dev</pre></div></div>

</li>
<li>
<div>Remove the commits I don&#8217;t want to push back to SVN</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git rebase <span style="color: #660033;">-i</span> git-svn</pre></div></div>

</li>
<li>
<div>Because I&#8217;m paranoid and want to make sure only the commits I want are actually coming through</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git <span style="color: #c20cb9; font-weight: bold;">svn</span> dcommit <span style="color: #660033;">--dry-run</span></pre></div></div>

</li>
<li>
<div>Commit it off to SVN</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git <span style="color: #c20cb9; font-weight: bold;">svn</span> dcommit</pre></div></div>

</li>
</ol>
<hr />
<h3>Changing History</h3>
<div class="code_instruction">
<div>Revise the last 37 commits. Opens up a log in $EDITOR where you can &#8216;squash&#8217; commits together</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git rebase <span style="color: #660033;">-i</span> HEAD~<span style="color: #000000;">37</span></pre></div></div>

</div>
<hr />
<h3>Undoing crazy rebases</h3>
<ol class="code_instructions">
<li>
<div>Find the commit you want to bring back, copy it&#8217;s sha1 starter</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git reflog</pre></div></div>

</li>
<li>
<div>Boom, commit is back.</div>

<div class="wp_syntax"><div class="code"><pre class="bash" style="font-family:monospace;">git cherry-pick <span style="color: #000000; font-weight: bold;">&lt;</span>sha1 starter<span style="color: #000000; font-weight: bold;">&gt;&lt;/</span>sha1<span style="color: #000000; font-weight: bold;">&gt;</span></pre></div></div>

</li>
</ol>
]]></content:encoded>
			<wfw:commentRss>http://blog.ummwhat.com/2009/08/git-and-svn-notes/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
		</item>
	</channel>
</rss>
