【书籍篇】Git 学习指南（一）基础概念及入门

---

读前须知： 本篇章内容取自《Git 学习指南》 P1~P17，如需更多详细内容请购买正版书籍
下一章节：

---

一. 基本概念

1.1 分布式版本控制

1.1.1 集中式版本控制系统

1.1.2 分布式版本控制系统

1.1.3 特型版本库

1.2 版本库，分布式工作的基础所在

1.2.1 散列值

---

对于所有的数据，他们都会被计算成一个十六进制散列值，这个散列值将会被用作相关对象的引用，以及日后恢复数据时所需的键值

---

1.3 分支的创建与合并

1.3.1 分支的其他操作

二. 入门

2.1 准备Git环境

git config --global user.email "jieKaMi@gmail.com"
1

2.2 创建版本库

2.2.1 初始化版本库

---

在F盘创建一个git文件夹，创建dev.txt和test.txt作为测试

---

$ cd /f/git-dev
$ git init 
Initialized empty Git repository in F:/git-dev/.git/
1
2
3

2.2.2 提交文件

---

b563b27: 散列值（该值取决于文件内容）

---

$ git add src.txt test.txt
$ git commit --message "first commit"
[master (root-commit) b563b27] first commit
 2 files changed, 2 insertions(+)
 create mode 100644 dev.txt
 create mode 100644 test.txt
1
2
3
4
5
6

2.2.3 检查状态

---

操作：
（1）修改dev.txt
（2）删除test.txt
（3）新增prod.txt

更多细节： git diff src.txt

---

$ git status
On branch master
Changes not staged for commit:
  (use "git add/rm ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

        modified:   dev.txt
        deleted:    test.txt

Untracked files:
  (use "git add ..." to include in what will be committed)

        prod.txt

no changes added to commit (use "git add" and/or "git commit -a")
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

2.2.4 提交修改

---

操作：
（1）添加dev.txt和prod.txt到git上 ，移除git上的test.txt
（2）再次调用status
（3）使用commit提交

---

$ git add dev.txt prod.txt
$ git rm test.txt
rm 'test.txt'

$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        modified:   dev.txt
        new file:   prod.txt
        deleted:    test.txt

$ git commit --message "second commit"
[master 8a08078] second commit
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 prod.txt
 delete mode 100644 test.txt

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

2.2.5 显示历史

---

log命令： 可用来显示项目的历史，所有提交都会按时间顺序被降序排列起来

---

$ git log
commit 8a08078e36778ae9506bf625054fb088ce708f59 (HEAD -> master)
Author: jieKaMi 
Date:   Mon Nov 20 23:33:03 2023 +0800

    second commit

commit b563b27503fb3ac34624418666656ed5db7a855f
Author: jieKaMi 
Date:   Mon Nov 20 23:29:22 2023 +0800

    first commit

1
2
3
4
5
6
7
8
9
10
11
12
13

2.3 Git的协作功能

2.3.1 克隆版本库

$ git clone /f/git-dev /f/git-clone
Cloning into 'F:/git-clone'...
done.
1
2
3

2.3.2 从另一版本库中获取修改

---

操作：
（1）修改dev.txt并在原版本库中提交
（2）修改prod.txt并在克隆版本库中提交
（3）在克隆库中pull一下
（4）可以在克隆库git log --graph查看记录

---

$ cd /f/git-dev/
$ git add dev.txt
$ git commit --message "three commit"
[master 2febc9b] three commit
 1 file changed, 1 insertion(+), 1 deletion(-)
 
$ cd /f/git-clone/
$ git add prod.txt
$ git commit --message "four commit"
[master bf4f4fd] four commit
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From F:/git-dev
   8a08078..2febc9b  master     -> origin/master
Merge made by the 'recursive' strategy.
 dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

$ git log --graph
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

2.3.3 从任意版本库中取回修改

---

操作：（1）回到原版本库 （2）从克隆库中pull修改操作

---

$ cd /f/git-dev
$ git pull /f/git-clone master
remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (8/8), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 5 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From F:/git-clone
 * branch            master     -> FETCH_HEAD
Updating 2febc9b..90d84a1
Fast-forward
 prod.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
1
2
3
4
5
6
7
8
9
10
11
12
13

2.3.4 创建共享版本库并应用

---

操作：（1）创建一个裸版本库 （2）修改原版本库dev.txt并提交 （3）向共享版本库使用push命令 （4）从共享库中同步到克隆库

裸版本库： 通常可被用来充当开发者们传递提交命令的汇聚点，以便其他人可从中拉回他们所做的修改

---

$ git clone --bare /f/git-dev /f/git-bare
Cloning into bare repository 'F:/git-bare'...
done.

$ cd /f/git-dev/
$ git add dev.txt
$ git commit --message "five commit"

$ git push /f/git-bare master
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 255 bytes | 255.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To F:/git-bare
   90d84a1..600c3c3  master -> master

$ cd /f/git-clone
$ git pull /f/git-bare master
remote: Enumerating objects: 8, done.
remote: Counting objects: 100% (8/8), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 6 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From F:/git-bare
 * branch            master     -> FETCH_HEAD
Updating 90d84a1..3d681ec
Fast-forward
 dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
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