_layouts/static.html
about.textile
contact.textile
projects.textile
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-us">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>litany against fear ¤ {{ page.title }} ¤ by nick quaranto</title>
+ <title>litany against fear ¤ by nick quaranto ¤ {{ page.title }}</title>
<meta name="author" content="Nick Quaranto" />
<link href="http://feeds2.feedburner.com/LitanyAgainstFear" rel="alternate" title="RSS" type="application/rss+xml" />
<link rel="stylesheet" href="/css/reset.css" type="text/css" media="screen, projection" />
@@ -17,9 +17,9 @@
<div class="container_12">
<div id="links" class="grid_2">
<a href="/about.html">about</a>
- <a href="/about.html">projects</a>
- <a href="/about.html">resume</a>
- <a href="/about.html">contact</a>
+ <a href="/projects.html">projects</a>
+ <a href="http://visualcv.com/nquaranto/">resume</a>
+ <a href="/contact.html">contact</a>
</div>
<div id="main" class="grid_8">
<h1><a href="/">litany against fear</a></h1>
_layouts/default.html
@@ -5,4 +5,34 @@ wordpress_url: http://litanyagainstfear.com/?p=396
layout: post
---
-"I've moved this post over to my other blog, gitready. Check it out there!":http://gitready.com
+I frequently need to do this when setting up or syncing my various machines, and I seem to forget the command all the time. So let's say you've got more than one branch on your remote, and you want to bring it down into your local repository as well:
+
+p=. !http://gitready.com/images/branches.png!
+
+Viewing information on the remote should look something like this:
+
+<pre>
+$ git remote show origin
+ * remote origin
+ URL: *************
+ Remote branch merged with 'git pull'
+ while on branch master
+ master
+ Tracked remote branches
+ haml master
+</pre>
+
+Luckily, the command syntax for this is quite simple:
+
+<pre>
+git checkout --track -b
+ <local branch> <remote>/<tracked branch>
+</pre>
+
+So in my case, I used this command:
+
+@git checkout --track -b haml origin/haml@
+
+You can also use a simpler version:
+
+@git checkout -t origin/haml@
_posts/2009-01-07-checkout-tracked-remote-branch-with-git.textile
@@ -114,7 +114,6 @@ h2 {
text-align: center;
font-size: 24px;
line-height: 22px;
- margin-bottom: 3px;
}
h3 {
@@ -176,6 +175,18 @@ ul { list-style-type: square; }
padding: 0px 30px;
}
+#post h2 {
+ margin-bottom: 3px;
+}
+
+#static {
+ padding: 0px 30px;
+}
+
+#static h2 {
+ margin-bottom: 15px;
+}
+
#date {
text-align: center;
color: #666;
css/screen.css
b553d7ef97d9f9de9eecf3d6c1e26caa62444028
Nick Quaranto
nick@quaran.to
http://github.com/qrush/litanyagainstfear/commit/601aef7d4a1637b4c7e30c403e751fc6f3cdb132
601aef7d4a1637b4c7e30c403e751fc6f3cdb132
2009-04-25T10:11:48-07:00
2009-04-25T10:11:48-07:00
Adding some static pages
99000e6dccdc095f771dc7c71eb103bdb21319e8
Nick Quaranto
nick@quaran.to