【Github】Git 简易教程

大朝哥 發表於 2020-12-4 23:09:00

<h1>介绍</h1>
<h2>1.1 Why Git?</h2>
<ul>
<li>用一个文件进行日期和版本号的迭代</li>
<li>管理基于本文信息的文件：文本文件（.txt），脚本文件（.py）</li>
<li>不擅长管理的文件：图片文件（.jpg），MS文档（.doc）</li>
</ul>
<h2>1.2 Git 安装</h2>
1. git-downloads: https://git-scm.com/downloads
2. 右侧会自动识别当前系统的最新版本，直接点击下载即可
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130010010996-2085116923.png" alt="" width="483" height="194" loading="lazy">
 
3. introduction：./Git/ReleaseNotes.html
 <img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130022259141-854610333.png" alt="" width="482" height="162" loading="lazy">
 
<h1>创建/修改版本库</h1>
<h2>2.1 Repository</h2>
<h3>init（创建版本库）</h3>
1. 打开Terminal（Windows 的 git bash）
2. 切换路径
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_09a24338-dd1c-4014-99c0-b1729d991120" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_09a24338-dd1c-4014-99c0-b1729d991120" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_09a24338-dd1c-4014-99c0-b1729d991120" class="cnblogs_code_hide">
<pre>1 $ cd ~/Desktop/gitTUT</pre>
</div>
View Code</div>
3. 添加用户 name 和用户 email
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_d01bf0f1-076e-488f-b1a5-aef09f26e94a" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_d01bf0f1-076e-488f-b1a5-aef09f26e94a" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_d01bf0f1-076e-488f-b1a5-aef09f26e94a" class="cnblogs_code_hide">
<pre>1 $ git config --global user.name "dongyu lin"
2 $ git config --global user.email "dongyulin@email.com"</pre>
</div>
View Code</div>
4. 该路径下建立git 的管理文件 .git
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_7a8d12ac-4b9d-43ee-85b4-f18496db25ee" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_7a8d12ac-4b9d-43ee-85b4-f18496db25ee" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_7a8d12ac-4b9d-43ee-85b4-f18496db25ee" class="cnblogs_code_hide">
<pre>1 $ git init
2 # Initialized empty Git repository in C:/Users/xxx/Desktop/gitTUT/.git/</pre>
</div>
View Code</div>
此时文件夹中没有任何文件，所以返回告诉我们已经建立了一个空的git 管理库
 
<h3>add（添加文件管理）</h3>
1.1 查看文件夹中的所有文件（仅显式文件）
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_64f74012-6c84-4aec-aa9e-c9e5213f7a39" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_64f74012-6c84-4aec-aa9e-c9e5213f7a39" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_64f74012-6c84-4aec-aa9e-c9e5213f7a39" class="cnblogs_code_hide">
<pre>1 $ ls</pre>
</div>
View Code</div>
1.2 查看文件夹中的所有文件（含隐藏文件，如.git）
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_369596a7-6d6a-4009-911b-da61311ba08c" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_369596a7-6d6a-4009-911b-da61311ba08c" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_369596a7-6d6a-4009-911b-da61311ba08c" class="cnblogs_code_hide">
<pre>1 $ ls -a
2 # ./../.git/</pre>
</div>
View Code</div>
2. 建立新的文件 main.py
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_b831554b-bbad-47c6-8102-168c50a11d6e" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_b831554b-bbad-47c6-8102-168c50a11d6e" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_b831554b-bbad-47c6-8102-168c50a11d6e" class="cnblogs_code_hide">
<pre>1 $ touch main.py</pre>
</div>
View Code</div>
3. 查看版本库的状态
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_03fed299-91a1-43dd-b297-2374fa93f144" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_03fed299-91a1-43dd-b297-2374fa93f144" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_03fed299-91a1-43dd-b297-2374fa93f144" class="cnblogs_code_hide">
<pre> 1 $ git status
 2
 3 # 输出
 4 On branch master #在master 分支
 5
 6 No commits yet
 7
 8 Untracked files:
 9 (use "git add <file>..." to include in what will be committed)
10 main.py #main.py还没有加入到版本库中（unstaged，显示红色）
11
12 nothing added to commit but untracked files present (use "git add" to track)</pre>
</div>
View Code</div>
4.1 将文件main.py 添加至版本库
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_1c2bd90b-4e14-408f-9ba8-e16d5eaa0d3a" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_1c2bd90b-4e14-408f-9ba8-e16d5eaa0d3a" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_1c2bd90b-4e14-408f-9ba8-e16d5eaa0d3a" class="cnblogs_code_hide">
<pre> 1 $ git add main.py
 2
 3 # 再次查看状态
 4 $ git status
 5
 6 # 输出
 7 On branch master
 8
 9 No commits yet
10
11 Changes to be committed:
12 (use "git rm --cached <file>..." to unstage)
13 new file: main.py #版本库已识别 main.py（staged, 显示绿色）</pre>
</div>
View Code</div>
4.2 一次性添加所有文件夹中未添加的文件
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_c4c03105-77fb-4cbf-93ad-af7e7f7d7ebe" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_c4c03105-77fb-4cbf-93ad-af7e7f7d7ebe" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_c4c03105-77fb-4cbf-93ad-af7e7f7d7ebe" class="cnblogs_code_hide">
<pre>1 $ git add .</pre>
</div>
View Code</div>
 
<h3>commit（提交改变）</h3>
1. 提交状态变更，并通过-m 自定义改变的信息
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_f5f7df68-b864-4114-a3dd-39063019e915" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_f5f7df68-b864-4114-a3dd-39063019e915" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_f5f7df68-b864-4114-a3dd-39063019e915" class="cnblogs_code_hide">
<pre>1 $ git commit -m "create main.py"
2
3 # 输出
4 create main.py
51 file changed, 0 insertions(+), 0 deletions(-)
6create mode 100644 main.py</pre>
</div>
View Code</div>
 
<h3>流程图</h3>
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130022523120-407649040.png" alt="" width="565" height="233" loading="lazy">
 
<h2>2.2 log & diff</h2>
<h3>log（操作日志）</h3>
1. 查看log
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_c544c605-1cf9-4369-b469-348ae62ddaf2" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_c544c605-1cf9-4369-b469-348ae62ddaf2" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_c544c605-1cf9-4369-b469-348ae62ddaf2" class="cnblogs_code_hide">
<pre>1 $ git log
2
3 # 输出
4 commit 32ba8cb21a13f46ac74b957aecc541ad6baa7303 (HEAD -> master)
5 Author: dongyu lin <dongyulin@email.com>
6 Date: Mon Nov 30 02:58:58 2020 +0800
7
8 create main.py #创建文件的操作记录</pre>
</div>
View Code</div>
2. 修改文件并查看log
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_b5688f5f-8057-4b7b-a141-5d7ad047d818" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_b5688f5f-8057-4b7b-a141-5d7ad047d818" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_b5688f5f-8057-4b7b-a141-5d7ad047d818" class="cnblogs_code_hide">
<pre> 1 # main.py 中添加一行代码：a=1
 2
 3 $ git status
 4
 5 # 输出
 6 On branch master
 7 Changes not staged for commit:
 8 (use "git add <file>..." to update what will be committed)
 9 (use "git restore <file>..." to discard changes in working directory)
10 modified: main.py #文件已修改但并未提交（显示红色）
11
12 no changes added to commit (use "git add" and/or "git commit -a")</pre>
</div>
View Code</div>
3. 添加（add）修改
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_02bf65aa-4559-4b0e-a0b1-ddc6b6b31176" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_02bf65aa-4559-4b0e-a0b1-ddc6b6b31176" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_02bf65aa-4559-4b0e-a0b1-ddc6b6b31176" class="cnblogs_code_hide">
<pre>1 $ git add main.py</pre>
</div>
View Code</div>
4. 提交（commit）修改
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_660c6d36-ff1a-49c4-af62-e93bdc33210d" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_660c6d36-ff1a-49c4-af62-e93bdc33210d" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_660c6d36-ff1a-49c4-af62-e93bdc33210d" class="cnblogs_code_hide">
<pre>1 $ git commit -m "change a=1"
2
3 #输出
4 change a=1
51 file changed, 1 insertion(+) #提示文件有一处添加</pre>
</div>
View Code</div>
5. 变更之后查看log
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_fc5e3cd7-f865-4df9-b20b-8c875e1c504d" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_fc5e3cd7-f865-4df9-b20b-8c875e1c504d" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_fc5e3cd7-f865-4df9-b20b-8c875e1c504d" class="cnblogs_code_hide">
<pre> 1 $ git log
 2
 3 # 输出
 4 commit 693ee47f323013129611ab00ceee77bf5787eec4 (HEAD -> master)
 5 Author: dongyu lin <dongyulin@email.com>
 6 Date: Mon Nov 30 03:19:42 2020 +0800
 7
 8 change a=1
 9
10 commit 32ba8cb21a13f46ac74b957aecc541ad6baa7303
11 Author: dongyu lin <dongyulin@email.com>
12 Date: Mon Nov 30 02:58:58 2020 +0800
13
14 create main.py</pre>
</div>
View Code</div>
 
<h3>diff：查看unstaged 状态的修改部分（还没add）与上个commit 的文件有何不同</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_386de19a-07b8-4169-b67b-b7aad6ff824d" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_386de19a-07b8-4169-b67b-b7aad6ff824d" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_386de19a-07b8-4169-b67b-b7aad6ff824d" class="cnblogs_code_hide">
<pre> 1 #上次提交的文件 a=1
 2 # 本次修改后未add 的文件 a=2 b=1
 3
 4 $ git diff
 5
 6 #输出
 7 diff --git a/main.py b/main.py
 8 index d25d49e..61ce15f 100644
 9 --- a/main.py
10 +++ b/main.py
11 @@ -1 +1,2 @@
12 -a = 1 #删除了 a=1
13 \ No newline at end of file
14 +a = 2 #添加了 a=2
15 +b = 1 #添加了 b=1
16 \ No newline at end of file</pre>
</div>
View Code</div>
 
<h3>diff --cached：查看staged 状态的修改部分（已经add，还没commit）与上个commit 的文件有何不同</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_59ceced9-56b3-45c8-baaf-1b0fce6727aa" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_59ceced9-56b3-45c8-baaf-1b0fce6727aa" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_59ceced9-56b3-45c8-baaf-1b0fce6727aa" class="cnblogs_code_hide">
<pre> 1 $ git add . #add 全部修改文件
 2 $ git diff --cached #查看add之后的文件差异
 3
 4 # 输出
 5 diff --git a/main.py b/main.py
 6 index d25d49e..61ce15f 100644
 7 --- a/main.py
 8 +++ b/main.py
 9 @@ -1 +1,2 @@
10 -a = 1
11 \ No newline at end of file
12 +a = 2
13 +b = 1
14 \ No newline at end of file</pre>
</div>
View Code</div>
 
<h3>diff HEAD：同时查看unstaged 和staged 状态的修改部分与上个commit 的文件有何不同</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_d2d91399-d701-4e15-ab32-39df52b2fb5a" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_d2d91399-d701-4e15-ab32-39df52b2fb5a" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_d2d91399-d701-4e15-ab32-39df52b2fb5a" class="cnblogs_code_hide">
<pre> 1 # 上次commit 的文件 a=1
 2 # 本次add过a=2 b=1，还没add过c=b
 3
 4 $ git diff HEAD #unstaged & staged
 5
 6 # 输出
 7 diff --git a/main.py b/main.py
 8 index d25d49e..ac13cf6 100644
 9 --- a/main.py
10 +++ b/main.py
11 @@ -1 +1,3 @@
12 -a = 1
13 \ No newline at end of file
14 +a = 2
15 +b = 1
16 +c = b
17 \ No newline at end of file</pre>
</div>
View Code</div>
 
<h3>比较</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_3b3dbc73-1f3e-4a0c-b5ff-b975efc88853" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_3b3dbc73-1f3e-4a0c-b5ff-b975efc88853" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_3b3dbc73-1f3e-4a0c-b5ff-b975efc88853" class="cnblogs_code_hide">
<pre> 1 $ git diff HEAD #unstaged & staged
 2
 3 # 输出
 4 diff --git a/main.py b/main.py
 5 index d25d49e..ac13cf6 100644
 6 --- a/main.py
 7 +++ b/main.py
 8 @@ -1 +1,3 @@
 9 -a = 1
10 \ No newline at end of file
11 +a = 2
12 +b = 1
13 +c = b
14 \ No newline at end of file
15
16 $ git diff #unstaged
17
18 #输出
19 diff --git a/main.py b/main.py
20 index 61ce15f..ac13cf6 100644
21 --- a/main.py
22 +++ b/main.py
23 @@ -1,2 +1,3 @@
24a = 2 # 前面没有+
25 \ No newline at end of file
26b = 1 # 前面没有+
27 +c = b
28 \ No newline at end of file
29
30 $ git diff --cached #staged
31
32 # 输出
33 diff --git a/main.py b/main.py
34 index d25d49e..61ce15f 100644
35 --- a/main.py
36 +++ b/main.py
37 @@ -1 +1,2 @@
38 -a = 1
39 \ No newline at end of file
40 +a = 2
41 +b = 1
42 \ No newline at end of file</pre>
</div>
View Code</div>
 
<h1>回到从前</h1>
<h2>3.1 reset（针对整个版本库）</h2>
<h3>commit --amend（添加修改至上次commit 的版本）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_a8894a5c-4db7-4404-8dc8-cc0d77267b7b" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_a8894a5c-4db7-4404-8dc8-cc0d77267b7b" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_a8894a5c-4db7-4404-8dc8-cc0d77267b7b" class="cnblogs_code_hide">
<pre> 1 $ touch 2.py #创建文件
 2 $ git add 2.py #添加文件
 3
 4 $ git commit --amend --no-edit #"--no-edit"：不编辑，直接合并到上一个commit
 5 # 输出
 6 change 2
 7Date: Mon Nov 30 03:47:46 2020 +0800
 82 files changed, 3 insertions(+), 1 deletion(-)
 9create mode 100644 2.py
10
11 $ git log --oneline #"--oneline"：每个commit 内容显示在一行
12 # 输出
13 6cfc14d (HEAD -> master) change 2 #添加过2.py文件的change 2
14 693ee47 change a=1
15 32ba8cb create main.py</pre>
</div>
View Code</div>
<h3>reset（回到上个add）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_e592f25d-1c13-4e66-913b-ed5bf1ff2491" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_e592f25d-1c13-4e66-913b-ed5bf1ff2491" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_e592f25d-1c13-4e66-913b-ed5bf1ff2491" class="cnblogs_code_hide">
<pre> 1 #main.py添加一行代码：d=4
 2
 3 $ git add main.py
 4
 5 $ git status -s
 6 # 输出
 7 Mmain.py #staged（显示绿色）
 8
 9 $ git reset main.py
10 # 输出
11 Unstaged changes after reset:
12 M main.py
13
14 $ git status -s
15M main.py #unstaged（显示红色）</pre>
</div>
View Code</div>
<h3>reset --hard HEAD（回到上个commit）</h3>
<h4>git指针</h4>
 <img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130042506589-1349603864.png" alt="" width="530" height="146" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130042616069-2129479060.png" alt="" width="536" height="175" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130042705157-1336493012.png" alt="" width="534" height="146" loading="lazy">
 <img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130042719632-648230342.png" alt="" width="533" height="175" loading="lazy">
 
 每个 <code>commit</code> 都有自己的 <code>id</code> 数字号, <code>HEAD</code> 是一个指针, 指引当前的状态是在哪个 <code>commit</code>. 最近的一次 <code>commit</code> 在最右边, 我们如果要回到过去, 就是让 <code>HEAD</code> 回到过去并 <code>reset</code> 此时的 <code>HEAD</code> 到过去的位置.
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_04fce03b-2260-4c77-afc4-4e12ddf2e87f" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_04fce03b-2260-4c77-afc4-4e12ddf2e87f" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_04fce03b-2260-4c77-afc4-4e12ddf2e87f" class="cnblogs_code_hide">
<pre> 1 $ git log --oneline #查看所有commit的id
 2 # 输出
 3 7f82abd (HEAD -> master) change 2
 4 693ee47 change a=1
 5 32ba8cb create main.py
 6
 7 #HEAD 显示当前commit
 8 $ git reset --hard HEAD
 9 HEAD is now at 7f82abd change 2
10
11 #HEAD 回到前一个commit
12 $ git reset --hard HEAD^
13 # 输出
14 HEAD is now at 693ee47 change a=1
15
16 #HEAD 回到任意commit
17 $ git reset --hard 32ba8cb
18 # 输出
19 HEAD is now at 32ba8cb create main.py
20
21 #查看log中的HEAD变更日志
22 $ git reflog
23 7f82abd (HEAD -> master) HEAD@{0}: reset: moving to 7f82abd
24 32ba8cb HEAD@{1}: reset: moving to HEAD
25 32ba8cb HEAD@{2}: reset: moving to 32ba8cb
26 693ee47 HEAD@{3}: reset: moving to HEAD
27 693ee47 HEAD@{4}: reset: moving to HEAD^
28 7f82abd (HEAD -> master) HEAD@{5}: reset: moving to HEAD
29 7f82abd (HEAD -> master) HEAD@{6}: commit (amend): change 2
30 6cfc14d HEAD@{7}: commit (amend): change 2
31 8036b1a HEAD@{8}: commit: change 2
32 693ee47 HEAD@{9}: commit: change a=1
33 32ba8cb HEAD@{10}: commit (initial): create main.py</pre>
</div>
View Code</div>
 
<h2>3.2 checkout （针对单个文件）</h2>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_3744bad6-d037-4f67-95d4-b9c8faa87f3f" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_3744bad6-d037-4f67-95d4-b9c8faa87f3f" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_3744bad6-d037-4f67-95d4-b9c8faa87f3f" class="cnblogs_code_hide">
<pre> 1 """
 2 create main.py
 3 创建main.py文件
 4
 5 change a=1
 6 仅对main.py 文件
 7 a=1
 8
 9 change 2
10 仅对main.py 文件
11 a=2
12 b=1
13 c=b
14 d=4
15 创建2.py 文件
16
17 change 3
18 仅对2.py 文件
19 a=2
20 b=1
21 c=b
22 d=4
23 """
24 $ git log --oneline
25 # 输出
26 67b64b2 (HEAD -> master) change 3
27 7f82abd change 2
28 693ee47 change a=1
29 32ba8cb create main.py
30
31 #仅main.py 文件回到change a=1 的状态
32 $ git checkout 693ee47 -- main.py #此时main.py内容变为a=1
33
34 $ git add main.py
35 $ git commit -m "back to change 1 and add commit for main.py"
36 # 输出
37 back to change 1 and add commit for main.py
381 file changed, 1 insertion(+), 4 deletions(-)
39
40 $ git log --oneline
41 # 输出
42 cbf7a0e (HEAD -> master) back to change 1 and add commit for main.py #此时并未改写change a=1，而是重新添加一个commit
43 67b64b2 change 3
44 7f82abd change 2
45 693ee47 change a=1
46 32ba8cb create main.py</pre>
</div>
View Code</div>
 
<h1>分支管理</h1>
<h2>4.1 branch</h2>
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130053654277-762022753.png" alt="" width="579" height="342" loading="lazy">
之前我们说编辑的所有改变都是在一条主分支 <code>master</code> 上进行的. 通常我们会把 <code>master</code> 当作最终的版本, 而开发新版本或者新属性的时候, 在另外一个分支上进行, 这样就能使开发和使用互不干扰了
<h3>graph（查看分支内容）</h3>
 
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_620b6978-d310-4e7e-a2b1-7e3e9cffca04" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_620b6978-d310-4e7e-a2b1-7e3e9cffca04" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_620b6978-d310-4e7e-a2b1-7e3e9cffca04" class="cnblogs_code_hide">
<pre>1 $ git log --oneline --graph
2 # 输出
3 * cbf7a0e (HEAD -> master) back to change 1 and add commit for main.py
4 * 67b64b2 change 3
5 * 7f82abd change 2
6 * 693ee47 change a=1
7 * 32ba8cb create main.py</pre>
</div>
View Code</div>
 
<h3>branch （创建和查看分支）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_8a972afb-ff69-4d02-b056-b5884ff2ffc8" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_8a972afb-ff69-4d02-b056-b5884ff2ffc8" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_8a972afb-ff69-4d02-b056-b5884ff2ffc8" class="cnblogs_code_hide">
<pre>1 $ git branch dev #创建dev分支
2
3 $ git branch #查看所有分支
4 # 输出
5 dev
6 * master # *代表当前的HEAD所在的分支</pre>
</div>
View Code</div>
 
<h3>checkout（移动到其他分支）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_b76bb97d-8782-433d-b402-6a560a060903" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_b76bb97d-8782-433d-b402-6a560a060903" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_b76bb97d-8782-433d-b402-6a560a060903" class="cnblogs_code_hide">
<pre>1 $ git checkout dev
2 # 输出
3 Switched to branch 'dev'
4
5 $ git branch
6 # 输出
7 * dev # HEAD指向dev分支
8 master</pre>
</div>
View Code</div>
 
<h3>checkout -b（创建并移动到新的分支）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_34cfde50-e7e6-4c1a-a748-fc43416efd07" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_34cfde50-e7e6-4c1a-a748-fc43416efd07" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_34cfde50-e7e6-4c1a-a748-fc43416efd07" class="cnblogs_code_hide">
<pre>1 $ git checkout -b dev2
2 # 输出
3 Switched to a new branch 'dev2'
4
5 $ git branch
6 # 输出
7 dev
8 * dev2 # HEAD 指向dev2 分支
9 master</pre>
</div>
View Code</div>
 
<h3>merge（分支中的修改推送到master）</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_3bd3a52f-ab7a-4e0b-9a98-5b88125f9a7e" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_3bd3a52f-ab7a-4e0b-9a98-5b88125f9a7e" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_3bd3a52f-ab7a-4e0b-9a98-5b88125f9a7e" class="cnblogs_code_hide">
<pre> 1 """
 2 dev分支
 3 2.py中添加一行代码：change3 = 'dev'
 4 """
 5 $ git commit -am "change 3 in dev" #"-am"：add所有改变并commit
 6 # 输出
 7 change 3 in dev
 81 file changed, 2 insertions(+)
 9
10 $ git checkout master # 切换至master
11 # 输出
12 Switched to branch 'master'
13
14 $ git merge dev # 将 dev分支 merge到 master中
15 # 输出
16 Updating 47f167e..50e43f0
17 Fast-forward # 默认fast-forward模式，不保留本次Merge的commit信息
182.py | 2 ++
191 file changed, 2 insertions(+)
20
21 $ git log --oneline --graph #log中没有保留dev中的commit
22 # 输出
23 * 50e43f0 (HEAD -> master, dev) change 3 in dev
24 * 47f167e back to change 1 and add comment for 1.py
25 * 904e1ba change 2
26 * c6762a1 change 1
27 * 13be9a7 create 1.py
28
29 """
30 dev2分支
31 2.py中添加一行代码：change4 = 'dev2'
32 """
33 $ git commit -am "change 4 in dev2"
34 #输出
35 change 4 in dev2
361 file changed, 2 insertions(+), 1 deletion(-)
37
38 $ git checkout master #切换至master
39 # 输出
40 Switched to branch 'master'
41
42 $ git merge --no-ff -m "keep merge info" dev2
43 # 输出
44 Merge made by the 'recursive' strategy. #recursive模式保留分支中的commit信息
452.py | 3 ++-
461 file changed, 2 insertions(+), 1 deletion(-)
47
48 $ git log --oneline --graph
49 # 输出
50 * 85dd1ec (HEAD -> master) keep merge info
51 |\
52 | * d6ae0fc (dev2) change 4 in dev2 #保留分支中的commit信息
53 |/
54 * 50e43f0 (dev) change 3 in dev
55 * 47f167e back to change 1 and add comment for 1.py
56 * 904e1ba change 2
57 * c6762a1 change 1
58 * 13be9a7 create 1.py</pre>
</div>
View Code</div>
 
<h2>4.2 merge（处理分支冲突）</h2>
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130070926781-2091371505.png" alt="" loading="lazy">
 如何处理 master 和 dev 同时修改后的 merge 冲突问题，比如：
<ul>
<li><code>master</code> 中的 <code>1.py</code> 加上 <code># edited in master</code>.</li>
<li><code>dev</code> 中的 <code>1.py</code> 加上 <code># edited in dev</code>.</li>
</ul>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_d5af37e4-135e-4447-b62f-39e20076c268" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_d5af37e4-135e-4447-b62f-39e20076c268" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_d5af37e4-135e-4447-b62f-39e20076c268" class="cnblogs_code_hide">
<pre> 1 $ git checkout master
 2 $ git log --oneline #master 中的log
 3 # 输出
 4 3d7796e (HEAD -> master) change 4 in master #与dev不同
 5 47f167e back to change 1 and add comment for 1.py
 6 904e1ba change 2
 7 c6762a1 change 1
 8 13be9a7 create 1.py
 9
10 $ git checkout dev
11 $ git log --oneline #dev 中的log
12 # 输出
13 f7d2e3a (HEAD -> dev) change 3 in dev #与master不同
14 47f167e back to change 1 and add comment for 1.py
15 904e1ba change 2
16 c6762a1 change 1
17 13be9a7 create 1.py
18
19 $ git merge dev
20 # 输出
21 Auto-merging 1.py
22 CONFLICT (content): Merge conflict in 1.py
23 Automatic merge failed; fix conflicts and then commit the result.</pre>
</div>
View Code</div>
当 merge dev 和 master 的时候，Git 发现 1.py 在 master 和 dev 中的版本不同，所以提示 merge 有冲突，具体的冲突 Git 已经在 1.py 文件中标注出来，打开文件就能看到（python自带的IDE打开）
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_da6236a4-bac2-41f9-b9ca-4b0be65ccfff" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_da6236a4-bac2-41f9-b9ca-4b0be65ccfff" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_da6236a4-bac2-41f9-b9ca-4b0be65ccfff" class="cnblogs_code_hide">
<pre>1 a = 1
2 # I went back to change 1
3 <<<<<<< HEAD
4 # edited in master
5 =======
6 # edited in dev
7 >>>>>>> dev</pre>
</div>
View Code</div>
此时，需要手动处理 1.py 中的冲突，将 HEAD 中的描述与 dev 中的描述合并起来
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_65dd8e1a-080b-4154-a377-38120635d9c4" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_65dd8e1a-080b-4154-a377-38120635d9c4" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_65dd8e1a-080b-4154-a377-38120635d9c4" class="cnblogs_code_hide">
<pre>1 a = 1
2 # I went back to change 1
3
4 # edited in master and dev</pre>
</div>
View Code</div>
commit 现在的文件即可解决冲突
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_3e1ed3d9-3564-4192-b208-8b6929504e39" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_3e1ed3d9-3564-4192-b208-8b6929504e39" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_3e1ed3d9-3564-4192-b208-8b6929504e39" class="cnblogs_code_hide">
<pre> 1 $ git commit -am "solve conflict"
 2 # 输出
 3 solve conflict
 4
 5 $ git log --oneline --graph
 6 # 输出
 7 * 99ebe95 (HEAD -> master) solve conflict
 8 |\
 9 | * f7d2e3a (dev) change 3 in dev
10 * | 3d7796e change 4 in master
11 |/
12 * 47f167e back to change 1 and add comment for 1.py
13 * 904e1ba change 2
14 * c6762a1 change 1
15 * 13be9a7 create 1.py</pre>
</div>
View Code</div>
 
 
 
<h2>4.3 rebase（处理分支冲突）</h2>
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130070945456-1736923984.png" alt="" loading="lazy">
 <img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130070952124-2064345568.png" alt="" width="341" height="152" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130071008590-1059063123.png" alt="" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130071020715-836015021.png" alt="" loading="lazy">
通过 rebase 使得 branch-A 的 C3 吸纳了 branch-B 的 C4 的更新，在 branch-A 与 branch-B 共享的分支中生成了新的 C3' ；
而通过 merge 方式生成的 C5 commint 仍旧在 branch-A 上面，因此只能在自己的分支中使用 rebase ，和别人共享的部分是不能使用的
 
如何处理 master 和 dev 同时修改后的 rebase 冲突问题，比如：
<ul>
<li><code>master</code> 中的 <code>1.py</code> 加上 <code># edited in master</code>.</li>
<li><code>dev</code> 中的 <code>1.py</code> 加上 <code># edited in dev</code>.</li>
</ul>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_18c9c892-6685-433f-9cfe-fbb569153911" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_18c9c892-6685-433f-9cfe-fbb569153911" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_18c9c892-6685-433f-9cfe-fbb569153911" class="cnblogs_code_hide">
<pre> 1 $ git checkout master
 2 $ git log --oneline #master 中的log
 3 # 输出
 4 3d7796e (HEAD -> master) change 4 in master #与dev不同
 5 47f167e back to change 1 and add comment for 1.py
 6 904e1ba change 2
 7 c6762a1 change 1
 8 13be9a7 create 1.py
 9
10 $ git checkout dev
11 $ git log --oneline #dev 中的log
12 # 输出
13 f7d2e3a (HEAD -> dev) change 3 in dev #与master不同
14 47f167e back to change 1 and add comment for 1.py
15 904e1ba change 2
16 c6762a1 change 1
17 13be9a7 create 1.py
18
19 $ git merge dev
20 # 输出
21 Auto-merging 1.py
22 CONFLICT (content): Merge conflict in 1.py
23 Automatic merge failed; fix conflicts and then commit the result.</pre>
</div>
View Code</div>
<div> </div>
<div>通过 rebase 合并 dev 到 master</div>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_ff64d914-d3ef-4c9f-8b19-f999fff8ed93" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_ff64d914-d3ef-4c9f-8b19-f999fff8ed93" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_ff64d914-d3ef-4c9f-8b19-f999fff8ed93" class="cnblogs_code_hide">
<pre> 1 $ git rebase dev
 2 # 输出
 3 error: could not apply 3d7796e... change 4 in master
 4 Resolve all conflicts manually, mark them as resolved with
 5 "git add/rm <conflicted_files>", then run "git rebase --continue".
 6 You can instead skip this commit: run "git rebase --skip".
 7 To abort and get back to the state before "git rebase", run "git rebase --abort".
 8 Could not apply 3d7796e... change 4 in master
 9 Auto-merging 1.py
10 CONFLICT (content): Merge conflict in 1.py</pre>
</div>
View Code</div>
 
Git 发现 1.py 在 master 和 dev 上的版本不同，因此提示 rebase 有冲突，详情打开 1.py 文件即可看到
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_dd2b4cf2-a336-4b23-a88a-c8723de329b3" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_dd2b4cf2-a336-4b23-a88a-c8723de329b3" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_dd2b4cf2-a336-4b23-a88a-c8723de329b3" class="cnblogs_code_hide">
<pre>1 a = 1
2 # I went back to change 1
3 <<<<<<< HEAD
4 # edited in dev
5 =======
6 # edited in master
7 >>>>>>> 3d7796e (change 4 in master)</pre>
</div>
View Code</div>
 
此时 HEAD 停留在 rebase 模式上
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_8d37fb2f-eca1-4a6e-98bd-2905ec9db5eb" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_8d37fb2f-eca1-4a6e-98bd-2905ec9db5eb" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_8d37fb2f-eca1-4a6e-98bd-2905ec9db5eb" class="cnblogs_code_hide">
<pre>1 $ git branch
2 # 输出
3 * (no branch, rebasing master) # HEAD在这
4 dev
5 master</pre>
</div>
View Code</div>
 
接下来打开 1.py 手动合并差异
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_729e0c2a-c672-4470-8aa2-f770025d6e5c" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_729e0c2a-c672-4470-8aa2-f770025d6e5c" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_729e0c2a-c672-4470-8aa2-f770025d6e5c" class="cnblogs_code_hide">
<pre>1 a = 1
2 # I went back to change 1
3
4 # edited in master and dev</pre>
</div>
View Code</div>
 
rebase 现在的文件即可解决冲突，但是 master 的历史会被修改，因此千万不要在共享分支中使用 rebase
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_0359d211-97c9-4055-a916-3a5ce63addb7" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_0359d211-97c9-4055-a916-3a5ce63addb7" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_0359d211-97c9-4055-a916-3a5ce63addb7" class="cnblogs_code_hide">
<pre> 1 $ git add 1.py
 2
 3 $ git rebase --continue
 4 # 输出
 5 Successfully rebased and updated refs/heads/master.
 6
 7 $ git log --oneline --graph
 8 # 输出
 9 * 7a70f12 (HEAD -> master) change 4 in master # 这条 commit 原本的id=3d7796e, 所以 master 的历史被修改
10 * f7d2e3a (dev) change 3 in dev # rebase 过来的dev commit
11 * 47f167e back to change 1 and add comment for 1.py
12 * 904e1ba change 2
13 * c6762a1 change 1
14 * 13be9a7 create 1.py</pre>
</div>
View Code</div>
 
<h2>4.4 stash（临时修改）</h2>
通过 stash 能够将目前手里的工作放在一边分隔开来，再另外单独处理之前的任务
<h3>暂存 dev 分支的任务</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_1d57ccde-cd0a-4235-84f4-88bd838054e0" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_1d57ccde-cd0a-4235-84f4-88bd838054e0" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_1d57ccde-cd0a-4235-84f4-88bd838054e0" class="cnblogs_code_hide">
<pre> 1 $ git checkout dev
 2 # 输出
 3 Switched to branch 'dev'
 4
 5 """
 6 1.py中添加一行代码：# feel happy
 7 """
 8
 9 $ git stash
10 # 输出
11 Saved working directory and index state WIP on dev: f7d2e3a change 3 in dev
12
13 $ git status
14 # 输出
15 On branch dev
16 nothing to commit, working tree clean # 干净得很</pre>
</div>
View Code</div>
 
<h3>完成 boss 分支的任务</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_d4648028-15d5-4448-85c8-2cd6bff3e46f" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_d4648028-15d5-4448-85c8-2cd6bff3e46f" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_d4648028-15d5-4448-85c8-2cd6bff3e46f" class="cnblogs_code_hide">
<pre> 1 $ git checkout -b boss
 2 # 输出
 3 Switched to a new branch 'boss'
 4
 5 """
 6 1.py中添加一行代码：# lovely boss
 7 """
 8
 9 $ git commit -am "job from boss"
10 # 输出
11 job from boss
121 file changed, 4 insertions(+)
13
14 $ git checkout master
15 # 输出
16 Switched to branch 'master'
17
18 $ git merge --no-ff -m "merge boos job" boss
19 # 输出
20 Auto-merging 1.py
21 CONFLICT (content): Merge conflict in 1.py
22 Automatic merge failed; fix conflicts and then commit the result.
23
24 """
25 冲突文件
26 a = 1
27 # I went back to change 1
28 <<<<<<< HEAD
29
30 # edited in master and dev
31
32 =======
33 # edited in dev
34
35 # lovely boss
36 >>>>>>> boss
37
38 修改为
39 a = 1
40 # I went back to change 1
41
42 # edited in master and dev
43
44 # lovely boss
45 """
46
47 $ git commit -am "solve conflict"
48 # 输出
49 solve conflict
50
51 $ git log --oneline --graph
52 # 输出
53 * b218671 (HEAD -> master) solve conflict
54 |\
55 | * 4ed34e8 (boss) job from boss
56 * | 2d1961f change 4 in master
57 |/
58 * f7d2e3a (dev) change 3 in dev
59 * 47f167e back to change 1 and add comment for 1.py
60 * 904e1ba change 2
61 * c6762a1 change 1
62 * 13be9a7 create 1.py</pre>
</div>
View Code</div>
 
<h3>恢复 dev 分支的任务</h3>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_f73c0e0b-e55a-47e1-88ba-2e040af7998a" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_f73c0e0b-e55a-47e1-88ba-2e040af7998a" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_f73c0e0b-e55a-47e1-88ba-2e040af7998a" class="cnblogs_code_hide">
<pre> 1 $ git checkout dev
 2 # 输出
 3 Switched to branch 'dev'
 4
 5 $ git stash list # 查看stash 中的缓存
 6 # 输出
 7 stash@{0}: WIP on dev: f7d2e3a change 3 in dev #stash 中有dev 的工作
 8
 9 $ git stash pop # 通过pop 来提取并继续工作
10 # 输出
11 On branch dev
12 Changes not staged for commit:
13 (use "git add <file>..." to update what will be committed)
14 (use "git restore <file>..." to discard changes in working directory)
15 modified: 1.py
16
17 no changes added to commit (use "git add" and/or "git commit -a")
18 Dropped refs/stash@{0} (18f4cb0facb172080e905ce8d890bfe1baea3049)
19
20 $ git status -s
21 # 输出
22M 1.py # 未add（显示红色）</pre>
</div>
View Code</div>
 
<h1>Git指令集</h1>
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_fc2cce3d-ee7f-42ce-9c6f-9ed8e2c27a13" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_fc2cce3d-ee7f-42ce-9c6f-9ed8e2c27a13" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_fc2cce3d-ee7f-42ce-9c6f-9ed8e2c27a13" class="cnblogs_code_hide">
<pre> 1 $ git --help
 2
 3 # 输出
 4 usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
 5 [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
 6 [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]
 7 [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
 8 <command> [<args>]
 9
10 These are common Git commands used in various situations:
11
12 start a working area (see also: git help tutorial)
13 clone Clone a repository into a new directory
14 init Create an empty Git repository or reinitialize an existing one
15
16 work on the current change (see also: git help everyday)
17 add Add file contents to the index
18 mv Move or rename a file, a directory, or a symlink
19 restore Restore working tree files
20 rm Remove files from the working tree and from the index
21 sparse-checkout Initialize and modify the sparse-checkout
22
23 examine the history and state (see also: git help revisions)
24 bisect Use binary search to find the commit that introduced a bug
25 diff Show changes between commits, commit and working tree, etc
26 grep Print lines matching a pattern
27 log Show commit logs
28 show Show various types of objects
29 status Show the working tree status
30
31 grow, mark and tweak your common history
32 branch List, create, or delete branches
33 commit Record changes to the repository
34 merge Join two or more development histories together
35 rebase Reapply commits on top of another base tip
36 reset Reset current HEAD to the specified state
37 switch Switch branches
38 tag Create, list, delete or verify a tag object signed with GPG
39
40 collaborate (see also: git help workflows)
41 fetch Download objects and refs from another repository
42 pull Fetch from and integrate with another repository or a local branch
43 push Update remote refs along with associated objects
44
45 'git help -a' and 'git help -g' list available subcommands and some
46 concept guides. See 'git help <command>' or 'git help <concept>'
47 to read about a specific subcommand or concept.
48 See 'git help git' for an overview of the system.</pre>
</div>
View Code</div>
 
<h1>Github</h1>
Git：本地管理库
Github：在线管理库
<h2>5.1 GitHub 在线代码管理</h2>
1. 添加在线版本库 repository
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130081150631-584331828.png" alt="" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130081504356-831437113.png" alt="" width="536" height="529" loading="lazy">
 
 
2. 将本地管理库连接到在线管理库
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130082231238-292847700.png" alt="" width="872" height="489" loading="lazy">
 
 
3. 上传成功
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130082412805-104510728.png" alt="" width="712" height="281" loading="lazy">
 
4. 查看文件历史（commit）
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130082526468-1370820767.png" alt="" width="857" height="231" loading="lazy">
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130082544628-1161739924.png" alt="" width="842" height="338" loading="lazy"><img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130082645756-2064801297.png" alt="" width="841" height="244" loading="lazy">
 
5. 本地更新推送至 github
<div class="cnblogs_code"><img src="https://images.cnblogs.com/OutliningIndicators/ContractedBlock.gif" id="code_img_closed_a52389b6-2aaf-40e0-8e8a-df6da652c710" class="code_img_closed"><img src="https://images.cnblogs.com/OutliningIndicators/ExpandedBlockStart.gif" id="code_img_opened_a52389b6-2aaf-40e0-8e8a-df6da652c710" class="code_img_opened" style="display: none">
<div id="cnblogs_code_open_a52389b6-2aaf-40e0-8e8a-df6da652c710" class="cnblogs_code_hide">
<pre> 1 """
 2 1.py添加一行代码：# happy github
 3 """
 4 $ git commit -am "change 5"
 5 # 输出
 6 change 5
 71 file changed, 1 insertion(+)
 8
 9 $ git push -u origin main
10 # 输出
11 Enumerating objects: 5, done.
12 Counting objects: 100% (5/5), done.
13 Delta compression using up to 16 threads
14 Compressing objects: 100% (3/3), done.
15 Writing objects: 100% (3/3), 326 bytes | 326.00 KiB/s, done.
16 Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
17 To https://github.com/vincent-lin89/git-demo.git
18 2d1961f..b888fe8main -> main
19 Branch 'main' set up to track remote branch 'main' from 'origin'.</pre>
</div>
View Code</div>
<img src="https://img2020.cnblogs.com/blog/1681860/202011/1681860-20201130083758829-1893874872.png" alt="" width="957" height="273" loading="lazy">
 
 
<h1>参考资料</h1>
莫烦Python
https://mofanpy.com/tutorials/others/git/
官方文档
https://git-scm.com/about
XX.GIT
http://bramus.github.io/ws2-sws-course-materials/xx.git.html#/
Bitbucket
https://www.atlassian.com/git/tutorials 
来源：https://www.cnblogs.com/blue-lin/p/14059251.html

頁: [1]

琼殿技术论坛's Archiver

【Github】Git 简易教程