-
Notifications
You must be signed in to change notification settings - Fork 0
/
atom.xml
167 lines (126 loc) · 4.07 KB
/
atom.xml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title><![CDATA[Category: git | Wongyouth's Blog]]></title>
<link href="http://wongyouth.github.com/blog/categories/git/atom.xml" rel="self"/>
<link href="http://wongyouth.github.com/"/>
<updated>2012-06-18T19:40:55+08:00</updated>
<id>http://wongyouth.github.com/</id>
<author>
<name><![CDATA[Wongyouth]]></name>
</author>
<generator uri="http://octopress.org/">Octopress</generator>
<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 <schacon@gee-mail.com>
Date: Mon Feb 9 14:45:11 2009 -0800
my version 1.4
commit 15027957951b64cf874c3557a0f3547bd83b3ff6
Merge: 4a447f7... a6b4c97...
Author: Scott Chacon <schacon@gee-mail.com>
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 -> 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 -> v0.1
* [new tag] v1.2 -> v1.2
* [new tag] v1.4 -> v1.4
* [new tag] v1.4-lw -> v1.4-lw
* [new tag] v1.5 -> v1.5
</code></pre>
]]></content>
</entry>
</feed>