指令行測試
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
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
<code>[root@linux-node1 ~]</code><code># mkdir testing</code>
<code>[root@linux-node1 ~]</code><code># </code>
<code>[root@linux-node1 ~]</code><code># cd testing/</code>
<code>[root@linux-node1 testing]</code><code># </code>
<code>[root@linux-node1 testing]</code><code># git init</code>
<code>Initialized empty Git repository </code><code>in</code> <code>/root/testing/</code><code>.git/</code>
<code>[root@linux-node1 testing]</code><code># echo "123" > index.html</code>
<code>[root@linux-node1 testing]</code><code># git add .</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "first commit"</code>
<code>[master (root-commit) b712131] first commit</code>
<code> </code><code>1 </code><code>file</code> <code>changed, 1 insertion(+)</code>
<code> </code><code>create mode 100644 index.html</code>
<code>[root@linux-node1 testing]</code><code># echo "a file" > a.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "add a.txt"</code>
<code>[master 025e8a3] add a.txt</code>
<code> </code><code>create mode 100644 a.txt</code>
<code>[root@linux-node1 testing]</code><code># echo "b file" > b.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "add b.txt"</code>
<code>[master f4b13b6] add b.txt</code>
<code> </code><code>create mode 100644 b.txt</code>
<code>[root@linux-node1 testing]</code><code># git log</code>
<code>commit f4b13b6d3fc390eacb59e0d6223ac37329d96d6f</code>
<code>Author: xiaoming <[email protected]></code>
<code>Date: Thu Dec 21 14:22:36 2017 +0800</code>
<code> </code><code>add b.txt</code>
<code>commit 025e8a337bfe312065d93b040852ceb532ef6642</code>
<code>Date: Thu Dec 21 14:22:12 2017 +0800</code>
<code> </code><code>add a.txt</code>
<code>commit b712131d81e3224f72f97c76f855e28da413450e</code>
<code>Date: Thu Dec 21 14:21:35 2017 +0800</code>
<code> </code><code>first commit</code>
<code>[root@linux-node1 testing]</code><code># git checkout -b dev</code>
<code>Switched to a new branch </code><code>'dev'</code>
<code>[root@linux-node1 testing]</code><code># git status</code>
<code>On branch dev</code>
<code>nothing to commit, working directory clean</code>
<code>[root@linux-node1 testing]</code><code># echo "welcome to beijing" > test1.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "test1"</code>
<code>[dev d224e8c] test1</code>
<code> </code><code>create mode 100644 test1.txt</code>
<code>[root@linux-node1 testing]</code><code># echo "welcome to shanghai" > test2.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "test2"</code>
<code>[dev e254dd5] test2</code>
<code> </code><code>create mode 100644 test2.txt</code>
<code>commit e254dd5657d99ed287faf62f74b566a7ac1bf858</code>
<code>Date: Thu Dec 21 14:26:01 2017 +0800</code>
<code> </code><code>test2</code>
<code>commit d224e8cb4a51a65377c8d8eb75c3613b197e47a4</code>
<code>Date: Thu Dec 21 14:25:37 2017 +0800</code>
<code> </code><code>test1</code>
<code>[root@linux-node1 testing]</code><code># git checkout master</code>
<code>Switched to branch </code><code>'master'</code>
<code>On branch master</code>
<code>[root@linux-node1 testing]</code><code># echo "master1" > master1.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "master1"</code>
<code>[master 1ebe653] master1</code>
<code> </code><code>create mode 100644 master1.txt</code>
<code>[root@linux-node1 testing]</code><code># echo "master2" > master2.txt</code>
<code>[root@linux-node1 testing]</code><code># git commit -m "master2"</code>
<code>[master 814b217] master2</code>
<code> </code><code>create mode 100644 master2.txt</code>
<code>commit 814b217ae84ca4ad541c36d96e9b3c2744bca849</code>
<code>Date: Thu Dec 21 14:28:15 2017 +0800</code>
<code> </code><code>master2</code>
<code>commit 1ebe65348f73958eeafce158f922d83e386faa78</code>
<code>Date: Thu Dec 21 14:27:50 2017 +0800</code>
<code> </code><code>master1</code>
<code>[root@linux-node1 testing]</code><code># git merge dev</code>
<code>Merge made by the </code><code>'recursive'</code> <code>strategy.</code>
<code> </code><code>test1.txt | 1 +</code>
<code> </code><code>test2.txt | 1 +</code>
<code> </code><code>2 files changed, 2 insertions(+)</code>
<code>commit df1da42a6c93152001199d684f01702eb6cb622f</code>
<code>Merge: 814b217 e254dd5</code>
<code>Date: Thu Dec 21 14:29:35 2017 +0800</code>
<code> </code><code>Merge branch </code><code>'dev'</code>
此時,整個分支合并圖如下:
分支的狀态會保留
如果使用git rebase dev,分支合并圖如下:
分支的狀态會清除
版權聲明:原創作品,謝絕轉載。否則将追究法律責任
本文轉自 IT_外賣小哥 51CTO部落格,原文連結:http://blog.51cto.com/jinlong/2052922