Site updated at 2012-01-21 09:00:25 UTC

liwh · Jan 21, 2012 · 714f0ba · 714f0ba
1 parent ae38aa4
commit 714f0ba
Show file tree

Hide file tree

Showing 46 changed files with 1,258 additions and 689 deletions.
diff --git a/about/index.html b/about/index.html
@@ -50,6 +50,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -113,6 +115,7 @@ <h2>ToDoList/Dream In 2012</h2>
 <li>Write more open source project using Ruby/Rails</li>
 <li>Do more physical exercise</li>
 <li>Learn NodeJS</li>
+<li>Enhance spoken English</li>
 </ul>
 
 
@@ -161,6 +164,10 @@ <h2>Follow Me</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -177,10 +184,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/atom.xml b/atom.xml
diff --git a/blog/2009/09/12/jquery-plugin/index.html b/blog/2009/09/12/jquery-plugin/index.html
@@ -53,6 +53,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -246,6 +248,10 @@ <h2>jCarousellite</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -262,10 +268,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2010/12/06/install-mongodb/index.html b/blog/2010/12/06/install-mongodb/index.html
@@ -53,6 +53,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -197,6 +199,10 @@ <h2>MongoDB学习资料</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -213,10 +219,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2010/12/08/study-resource/index.html b/blog/2010/12/08/study-resource/index.html
@@ -50,6 +50,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -171,6 +173,10 @@ <h1>linux 开机自动启动脚本方法</h1>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -187,10 +193,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2010/12/16/rake-tutorial/index.html b/blog/2010/12/16/rake-tutorial/index.html
@@ -50,6 +50,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -245,6 +247,10 @@ <h2>相关资料</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -261,10 +267,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2010/12/24/introduce-git/index.html b/blog/2010/12/24/introduce-git/index.html
@@ -51,6 +51,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -254,6 +256,8 @@ <h3>合并分支</h3>
 <span class='line-number'>10</span>
 <span class='line-number'>11</span>
 <span class='line-number'>12</span>
+<span class='line-number'>13</span>
+<span class='line-number'>14</span>
 </pre></td><td class='code'><pre><code class='bash'><span class='line'>  <span class="c">#将b分支合并到当前分支</span>
 </span><span class='line'>  git merge b
 </span><span class='line'>  <span class="c">#选择某一个分支中的一个或几个commit来进行合并</span>
@@ -266,6 +270,8 @@ <h3>合并分支</h3>
 </span><span class='line'>  git rebase -- abort
 </span><span class='line'>  <span class="c">#更新本地分支的远程repo的url</span>
 </span><span class='line'>  git remote <span class="nb">set</span>-url remote_name new_url
+</span><span class='line'>  <span class="c">#合并多个commit,可见 http://stackoverflow.com/questions/4936778/git-merge-commits</span>
+</span><span class='line'>  git rebase -i HEAD~2  <span class="c">#然后对文件进行编译，可达到预定的效果</span>
 </span></code></pre></td></tr></table></div></figure>
 
 
@@ -376,6 +382,10 @@ <h3>Tag</h3>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -392,10 +402,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/03/install-zsh/index.html b/blog/2011/03/03/install-zsh/index.html
@@ -51,6 +51,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -214,6 +216,10 @@ <h2>参考资料</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -230,10 +236,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/20/textmate-setup/index.html b/blog/2011/03/20/textmate-setup/index.html
@@ -51,6 +51,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -207,6 +209,10 @@ <h1>参考资料</h1>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -223,10 +229,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/20/textmate-shortcuts/index.html b/blog/2011/03/20/textmate-shortcuts/index.html
@@ -53,6 +53,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -230,6 +232,10 @@ <h2>参考资料</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -246,10 +252,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/22/osx-launchd/index.html b/blog/2011/03/22/osx-launchd/index.html
@@ -51,6 +51,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -265,6 +267,10 @@ <h1>参考资料</h1>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -281,10 +287,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/29/rspec-view/index.html b/blog/2011/03/29/rspec-view/index.html
@@ -52,6 +52,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -341,6 +343,10 @@ <h2>参考资料</h2>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -357,10 +363,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>

diff --git a/blog/2011/03/31/introduce-redis-resque/index.html b/blog/2011/03/31/introduce-redis-resque/index.html
@@ -53,6 +53,8 @@
   <header role="banner"><hgroup>
   <h1><a href="/">Code for fun</a></h1>
 
+    <h2>Do It Right Now!</h2>
+
 </hgroup>
 
 </header>
@@ -393,6 +395,10 @@ <h1>测试</h1>
   <h1>Recent Posts</h1>
   <ul id="recent_posts">
 
+      <li class="post">
+        <a href="/blog/2012/01/18/create-blog-with-nodejs/">用NodeJS创建博客</a>
+      </li>
+
       <li class="post">
         <a href="/blog/2012/01/09/how-to-add-image-to-map-pin/">给地图大头针加图片</a>
       </li>
@@ -409,10 +415,6 @@ <h1>Recent Posts</h1>
         <a href="/blog/2012/01/06/how-to-draw-circle/">how-to-draw-circle</a>
       </li>
 
-      <li class="post">
-        <a href="/blog/2012/01/03/ios-gcd/">GCD介绍</a>
-      </li>
-
   </ul>
 </section>
 <section>