Permalink
Browse files

Site updated at 2012-04-26 03:04:36 UTC

  • Loading branch information...
1 parent 0657ae1 commit 657ad15d33938426cd406cad028fdf6d560cf0f7 @wongyouth committed Apr 26, 2012
View
153 atom.xml
@@ -4,7 +4,7 @@
<title><![CDATA[Wongyouth's Blog]]></title>
<link href="http://wongyouth.github.com/atom.xml" rel="self"/>
<link href="http://wongyouth.github.com/"/>
- <updated>2012-04-21T23:52:49+08:00</updated>
+ <updated>2012-04-26T11:03:54+08:00</updated>
<id>http://wongyouth.github.com/</id>
<author>
<name><![CDATA[Wongyouth]]></name>
@@ -14,6 +14,157 @@
<entry>
+ <title type="html"><![CDATA[Git分支常用操作]]></title>
+ <link href="http://wongyouth.github.com/blog/2012/04/26/git-branch/"/>
+ <updated>2012-04-26T10:55:00+08:00</updated>
+ <id>http://wongyouth.github.com/blog/2012/04/26/git-branch</id>
+ <content type="html"><![CDATA[<h2>生存一个分支,名字为issue1</h2>
+
+<pre><code>git branch issue1
+</code></pre>
+
+<h2>切换到一个分支issue1</h2>
+
+<pre><code>git checkout issue1
+</code></pre>
+
+<h2>生存一个本地分支并切换到它</h2>
+
+<pre><code>git checkout -b issue1
+</code></pre>
+
+<h2>修改后提交</h2>
+
+<pre><code>git commit -am 'fix issue1'
+</code></pre>
+
+<h2>切换到主分支</h2>
+
+<pre><code>git checkout master
+</code></pre>
+
+<h2>合并issue1到主分支</h2>
+
+<pre><code>git merge issue1
+</code></pre>
+
+<h2>递交到远程</h2>
+
+<pre><code>git push origin issue1
+</code></pre>
+
+<h2>复制远程分支到本地</h2>
+
+<pre><code>git checkout -b issue1 origin/issue1
+</code></pre>
+
+<h2>删除远程分支</h2>
+
+<pre><code>git push origin :issue1
+</code></pre>
+
+<h2>删除本地分支</h2>
+
+<pre><code>git branch -d issue1
+</code></pre>
+]]></content>
+ </entry>
+
+ <entry>
+ <title type="html"><![CDATA[Git标签常用操作]]></title>
+ <link href="http://wongyouth.github.com/blog/2012/04/26/git-tagging/"/>
+ <updated>2012-04-26T10:51:00+08:00</updated>
+ <id>http://wongyouth.github.com/blog/2012/04/26/git-tagging</id>
+ <content type="html"><![CDATA[<h2>显示所有标签</h2>
+
+<pre><code>git tag
+</code></pre>
+
+<h2>筛选标签</h2>
+
+<pre><code>$ git tag -l 'v1.4.2.*'
+v1.4.2.1
+v1.4.2.2
+v1.4.2.3
+v1.4.2.4
+</code></pre>
+
+<h2>代注释的标签</h2>
+
+<pre><code>$ git tag -a v1.4 -m 'my version 1.4'
+$ git tag
+v0.1
+v1.3
+v1.4
+
+$ git show v1.4
+tag v1.4
+Tagger: Scott Chacon &lt;schacon@gee-mail.com&gt;
+Date: Mon Feb 9 14:45:11 2009 -0800
+
+my version 1.4
+commit 15027957951b64cf874c3557a0f3547bd83b3ff6
+Merge: 4a447f7... a6b4c97...
+Author: Scott Chacon &lt;schacon@gee-mail.com&gt;
+Date: Sun Feb 8 19:02:46 2009 -0800
+
+ Merge branch 'experiment'
+</code></pre>
+
+<h2>轻量标签</h2>
+
+<pre><code>$ git tag v1.4-lw
+$ git tag
+v0.1
+v1.3
+v1.4
+v1.4-lw
+v1.5
+</code></pre>
+
+<h2>给过去递交标签</h2>
+
+<pre><code>$ git log --pretty=oneline
+15027957951b64cf874c3557a0f3547bd83b3ff6 Merge branch 'experiment'
+a6b4c97498bd301d84096da251c98a07c7723e65 beginning write support
+0d52aaab4479697da7686c15f77a3d64d9165190 one more thing
+6d52a271eda8725415634dd79daabbc4d9b6008e Merge branch 'experiment'
+0b7434d86859cc7b8c3d5e1dddfed66ff742fcbc added a commit function
+4682c3261057305bdd616e23b64b0857d832627b added a todo file
+166ae0c4d3f420721acbb115cc33848dfcc2121a started write support
+9fceb02d0ae598e95dc970b74767f19372d61af8 updated rakefile
+964f16d36dfccde844893cac5b347e7b3d44abbc commit the todo
+8a5cbc430f1a9c3d00faaeffd07798508422908a updated readme
+
+$ git tag -a v1.2 9fceb02
+</code></pre>
+
+<h2>分享标签</h2>
+
+<pre><code>$ git push origin v1.5
+Counting objects: 50, done.
+Compressing objects: 100% (38/38), done.
+Writing objects: 100% (44/44), 4.56 KiB, done.
+Total 44 (delta 18), reused 8 (delta 1)
+To git@github.com:schacon/simplegit.git
+* [new tag] v1.5 -&gt; v1.5
+
+$ git push origin --tags
+Counting objects: 50, done.
+Compressing objects: 100% (38/38), done.
+Writing objects: 100% (44/44), 4.56 KiB, done.
+Total 44 (delta 18), reused 8 (delta 1)
+To git@github.com:schacon/simplegit.git
+ * [new tag] v0.1 -&gt; v0.1
+ * [new tag] v1.2 -&gt; v1.2
+ * [new tag] v1.4 -&gt; v1.4
+ * [new tag] v1.4-lw -&gt; v1.4-lw
+ * [new tag] v1.5 -&gt; v1.5
+</code></pre>
+]]></content>
+ </entry>
+
+ <entry>
<title type="html"><![CDATA[用octopress来写博客并发布到Github上]]></title>
<link href="http://wongyouth.github.com/blog/2012/04/21/install-octopress-to-write-blogs-and-deploy-on-github-dot-com/"/>
<updated>2012-04-21T20:54:00+08:00</updated>
@@ -240,6 +240,8 @@ <h1 class="entry-title">用octopress来写博客并发布到Github上</h1>
<a class="basic-alignment left" href="/blog/2012/04/21/install-ruby-environment-on-ubuntu/" title="Previous Post: Ubuntu下安装ruby开发环境">&laquo; Ubuntu下安装ruby开发环境</a>
+ <a class="basic-alignment right" href="/blog/2012/04/26/git-tagging/" title="Next Post: Git标签常用操作">Git标签常用操作 &raquo;</a>
+
</p>
</footer>
</article>
@@ -259,6 +261,14 @@ <h1 class="entry-title">用octopress来写博客并发布到Github上</h1>
<ul id="recent_posts">
<li class="post">
+ <a href="/blog/2012/04/26/git-branch/">Git分支常用操作</a>
+ </li>
+
+ <li class="post">
+ <a href="/blog/2012/04/26/git-tagging/">Git标签常用操作</a>
+ </li>
+
+ <li class="post">
<a href="/blog/2012/04/21/install-octopress-to-write-blogs-and-deploy-on-github-dot-com/">用octopress来写博客并发布到Github上</a>
</li>
@@ -250,6 +250,14 @@ <h1 class="entry-title">Ubuntu下安装ruby开发环境</h1>
<ul id="recent_posts">
<li class="post">
+ <a href="/blog/2012/04/26/git-branch/">Git分支常用操作</a>
+ </li>
+
+ <li class="post">
+ <a href="/blog/2012/04/26/git-tagging/">Git标签常用操作</a>
+ </li>
+
+ <li class="post">
<a href="/blog/2012/04/21/install-octopress-to-write-blogs-and-deploy-on-github-dot-com/">用octopress来写博客并发布到Github上</a>
</li>
Oops, something went wrong.

0 comments on commit 657ad15

Please sign in to comment.