Git

Git

Git简介

1.什么是Git？

1
2
3
Git是一个开源的分布式版本控制系统，用于敏捷高效地处理任何或大或小的项目。
Git是Linus Torvalds为了帮助管理Linux内核开发而开发的一个开放源代码的版本控制软件。
Git与常用的版本控制工具CVS、Subversion等不同，它采用了分布式版本库的方式，不用服务器端软件支持。

2.Git的特点

1
Git是目前世界上最先进的分布式版本控制系统，在处理各种项目时，都十分高效，而且非常的高大上

Git配置

1
2
3
4
5
6
[root@VM-2-11-centos ~]# git config --global user.name "ssk"
[root@VM-2-11-centos ~]# git config --global user.email "123.com"
[root@VM-2-11-centos ~]# git config --list
user.name=ssk
user.email=123.com

Git基本命令

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
[root@VM-2-11-centos ~]# mkdir learngit
[root@VM-2-11-centos ~]# cd learngit/
[root@VM-2-11-centos learngit]# pwd
/root/learngit
# 初始化git仓库
[root@VM-2-11-centos learngit]# git init 
Initialized empty Git repository in /root/learngit/.git/
[root@VM-2-11-centos learngit]# ls -la
total 12
drwxr-xr-x  3 root root 4096 Jun 27 14:43 .
dr-xr-x---. 7 root root 4096 Jun 27 14:42 ..
drwxr-xr-x  7 root root 4096 Jun 27 14:43 .git
# 编辑一个文件
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software.
# 查看git状态
[root@VM-2-11-centos learngit]# git status
# On branch master
#
# Initial commit
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	readme.md
nothing added to commit but untracked files present (use "git add" to track)
# 添加到暂存区
[root@VM-2-11-centos learngit]# git add readme.md  
# 全部添加
git add .
[root@VM-2-11-centos learngit]# git status
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#	new file:   readme.md
# 记录提及记录内容
[root@VM-2-11-centos learngit]# git commit -m "the is new file"
[master (root-commit) c4e3cbe] the is new file
 1 file changed, 2 insertions(+)
 create mode 100644 readme.md
 # 更改文件内容
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
# 添加到缓存区
[root@VM-2-11-centos learngit]# git add readme.md 
# 提交到版本库
[root@VM-2-11-centos learngit]# git commit -m "append GPL"
[master 65343e2] append GPL
 1 file changed, 2 insertions(+), 1 deletion(-)
 # 查看日志 发现有2条记录
[root@VM-2-11-centos learngit]# git log
commit 65343e289a60ac1bcfd7a008524616ad1f656156
Author: ssk <123.com>
Date:   Tue Jun 27 14:53:29 2023 +0800

    append GPL

commit c4e3cbe473238f76e4f33c2ac2e90b2932855b4f
Author: ssk <123.com>
Date:   Tue Jun 27 14:49:59 2023 +0800

    the is new file
# 过滤
[root@VM-2-11-centos learngit]# git log --pretty=oneline
65343e289a60ac1bcfd7a008524616ad1f656156 append GPL
c4e3cbe473238f76e4f33c2ac2e90b2932855b4f the is new file
# 退回到第一次提交的版本
[root@VM-2-11-centos learngit]# git reset --hard c4e3
HEAD is now at c4e3cbe the is new file
[root@VM-2-11-centos learngit]# git log
commit c4e3cbe473238f76e4f33c2ac2e90b2932855b4f
Author: ssk <123.com>
Date:   Tue Jun 27 14:49:59 2023 +0800

    the is new file
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software.
[root@VM-2-11-centos learngit]# git log
commit c4e3cbe473238f76e4f33c2ac2e90b2932855b4f
Author: ssk <123.com>
Date:   Tue Jun 27 14:49:59 2023 +0800

    the is new file

# 恢复第二版本
[root@VM-2-11-centos learngit]# git reset --hard 65343
HEAD is now at 65343e2 append GPL
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
[root@VM-2-11-centos learngit]# git log
commit 65343e289a60ac1bcfd7a008524616ad1f656156
Author: ssk <123.com>
Date:   Tue Jun 27 14:53:29 2023 +0800

    append GPL

commit c4e3cbe473238f76e4f33c2ac2e90b2932855b4f
Author: ssk <123.com>
Date:   Tue Jun 27 14:49:59 2023 +0800

    the is new file
# 想回退历史： git log命令查看以便回到哪个版本；
# 想重返未来版本： git reflog命令查看每个版本的commit id，直接git reset --hard commit_id即可。
[root@VM-2-11-centos learngit]# git reflog
65343e2 HEAD@{0}: reset: moving to 65343
c4e3cbe HEAD@{1}: reset: moving to c4e3
65343e2 HEAD@{2}: commit: append GPL
c4e3cbe HEAD@{3}: commit (initial): the is new file

Git的管理与修改

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
# 在原来文件添加2两行文件
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
Hello word!
Hello word!
# 添加到暂存区
[root@VM-2-11-centos learngit]# git add readme.md 
[root@VM-2-11-centos learngit]# git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   readme.md
# 不提交 在再做一次修改
[root@VM-2-11-centos learngit]# vim readme.md 
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
Hello word!
Bey Bey
#  不添加到缓存区 直接提交到本地仓库
[root@VM-2-11-centos learngit]# git commit -m "git tracks changes"
[master 48681b6] git tracks changes
 1 file changed, 2 insertions(+)
[root@VM-2-11-centos learngit]# git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   readme.md
#
no changes added to commit (use "git add" and/or "git commit -a")
# 明明提交了，然后文件仍然是处于修改的状态
# 对比工作区和git版本仓库的文件区别
[root@VM-2-11-centos learngit]# git diff HEAD -- readme.md 
diff --git a/readme.md b/readme.md
index af2dcd8..c9d9223 100644
--- a/readme.md
+++ b/readme.md
@@ -2,4 +2,4 @@ Git is a version control system.
 Git is free software .
 Git is a distributed version control system
 Hello word!
-Hello word!
+Bey Bey
# 重新加入缓存区 重新提交
[root@VM-2-11-centos learngit]# git add .
[root@VM-2-11-centos learngit]# git commit  -m "new file" readme.md 
[master 10cde87] new file
 1 file changed, 1 insertion(+), 1 deletion(-)
[root@VM-2-11-centos learngit]# 
[root@VM-2-11-centos learngit]# git status 
# On branch master
nothing to commit, working directory clean

Git撤销修改

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
# 在文本添加一行
[root@VM-2-11-centos learngit]# vim readme.md 
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
rm -rf *
# 对工作区中文件的修改分为三种情况：

(1)还没有git add

　　　　直接使用git  checkout  filename，即可撤销修改，撤销修改就回到和版本库一模一样的样子。

(2)已经git add

　　　　先使用git  reset  HEAD  filename，然后在使用git checkout -- 文件进行修改撤销。

(3)已经git add，并再次进行修改

　　　　先使用git  checkout  filename，文件就会变成添加到暂存区后的状态，也就转换成了“第二种情况”，

　　　　然后，在使用情况(2)中的处理方法，即可将文件恢复到与版本库一致的状态

[root@VM-2-11-centos learngit]# git checkout readme.md 
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
# 如果已经git add readme.md
[root@VM-2-11-centos learngit]# git add readme.md 
[root@VM-2-11-centos learngit]# git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   readme.md
[root@VM-2-11-centos learngit]# git reset HEAD readme.md 
Unstaged changes after reset:
M	readme.md
[root@VM-2-11-centos learngit]# git checkout readme.md 
[root@VM-2-11-centos learngit]# cat readme.md 
Git is a version control system.
Git is free software .
Git is a distributed version control system
# “git  checkout  filename”      命令，撤销的是工作中文件的修改。

# “git  reset  HEAD  filename”  命令，撤销的是暂存区中文件的修改

Git删除文件

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
# 创建一个文件并提交到本地仓库
[root@VM-2-11-centos learngit]# touch test.txt
[root@VM-2-11-centos learngit]# git add test.txt 
[root@VM-2-11-centos learngit]# git commit -m "the is test file " test.txt 
[master f24df0d] the is test file
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test.txt
[root@VM-2-11-centos learngit]# git status
# On branch master
nothing to commit, working directory clean
# 删除本地文件
[root@VM-2-11-centos learngit]# rm test.txt 
rm: remove regular empty file ‘test.txt’? y
[root@VM-2-11-centos learngit]# ls
readme.md
# Git知道你删除了文件，因此，工作区和版本库就不一致了，git status 会告知你删除了那个文件
[root@VM-2-11-centos learngit]# git status
# On branch master
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    test.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
# 后悔药
[root@VM-2-11-centos learngit]# git checkout test.txt
[root@VM-2-11-centos learngit]# ls
readme.md  test.txt
# 工作区和版本库中同时删除（git rm file）
[root@VM-2-11-centos learngit]# git rm test.txt
rm 'test.txt'
[root@VM-2-11-centos learngit]# ls
readme.md
[root@VM-2-11-centos learngit]# git reset HEAD test.txt
Unstaged changes after reset:
D	test.txt
[root@VM-2-11-centos learngit]# git checkout test.txt
[root@VM-2-11-centos learngit]# ls
readme.md  test.txt
# 从来没有被添加到版本库就被删除的文件，是无法恢复的！

常用命令

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
git init	初始化仓库
git clone	拷贝一份远程仓库，也就是下载一个项目
提交与修改	
git add	添加文件到暂存区
git status	查看仓库当前的状态，显示有变更的文件
git diff	比较暂存区和版本库中文件的差异
git commit	提交暂存区到本地仓库
git reset	回退版本
git rm	删除工作区和版本库中的文件
git mv	移动或重命名工作区文件
提交日志	
git log (–pretty=oneline)	查看历史提交记录(后者代表每个记录在一行显示)
git blame file	以列表形式查看指定文件的历史修改记录
远程操作	
git remote	远程仓库操作
git fetch	从远程获取代码库
git pull	拉取下载远程代码并合并
git push	将本地代码上传至远程仓库并合并

创建分支

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
[root@wiki study-notes]# git checkout -b dev
[root@wiki study-notes]# git branch 
* dev
  master
[root@wiki study-notes]# git checkout master
[root@wiki study-notes]# git branch 
  dev
* master
[root@wiki study-notes]# touch sss
[root@wiki study-notes]# git add sss
[root@wiki study-notes]# git commit -m "sss" sss
[dev 7303ef2] sss
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sss

[root@wiki study-notes]# git merge dev 
Updating f82a2cb..7303ef2
Fast-forward
 sss | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sss
 # 查看分支
[root@wiki study-notes]# git branch -a
  dev
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
 # 删除分支
[root@wiki study-notes]# git branch -a
  dev
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/master
# git删除远程分支：git push origin --delete  远程分支名

免密上传到gitee

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
ssh-keygen -t rsa -C "123.com"
cat ~/.ssh/id_rsa.pub
[root@wiki gitee_file]#  ssh -T git@gitee.com
[root@wiki gitee_file]# git remote set-url origin git@gitee.com:sun-shengkai/study-notes.git
[root@wiki gitee_file]# git config --get remote.origin.url  
git@gitee.com:sun-shengkai/study-notes.git

git config --global user.email "xxxxxx"
git config --global user.name "xxxxx"
git init 
git add .
git commit -m "Liunx Notes" 
git status
git remote add origin https://gitee.com/xxxxxxx.git
git push -u origin master