-
git是一个分布式版本控制系统
1、使用命令(适用于Ubuntu Linux或者Debian):
$ sudo apt-get install git
2、创建仓库,并且初始化它
$ mkdir gitTest # 创建仓库
$ git init # 初始化仓库
3、将文件添加到仓库中
$ git add one.txt
4、将放在暂存库中的文件进行提交
$ git commit -m "write one" # -m后的内容,是对提交内容的说明
5、对 one.txt 再次进行修改时,查看仓库当前的状态:
$ 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: one.txt
no changes added to commit (use "git add" and/or "git commit -a")
6、查看修改之后,具体变更了哪些内容:
$ git diff one.txt # diff就是找不同
diff --git a/one.txt b/one.txt
index 5626abf..814f4a4 100644
--- a/one.txt
+++ b/one.txt
@@ -1 +1,2 @@
one
+two
7、提交新文件和提交修改之后的文件是一样的操作:
$ git add one.txt
$ git status # 告诉我们,将要被提交的修改就是 one.txt
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: one.txt
8、提交新文件:
$ git commit -m "add two"
[master e0c01fb] add two
1 file changed, 1 insertion(+)
-
版本回退
9、再给 one.txt 增加一行语句之后,尝试提交:
$ git add one.txt
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: one.txt
$ git commit -m "add htree"
[master 284da1e] add htree
1 file changed, 1 insertion(+)
10、提交了几个版本呢?也无从知晓,一个人命令来帮助你知道,时间是按离现在最近的开始排序的:
$ git log # 结果出来之后发现有3次历史记录
commit 284da1e66486c6986e0ad6fca36a2e3752f05049 (HEAD -> master)
Author: xxxxxxxx <xxxxxxxx@xxxxx.com>
Date: Tue Nov 5 14:37:44 2019 +0800
add htree
commit e0c01fbe642a2389957cb7da5ed190c0c8ade25d
Author: xxxxxxxx <xxxxx@xxxxx.com>
Date: Tue Nov 5 14:29:58 2019 +0800
add two
commit 9a24fb5dea410372ad4971067e6b9b830699429a
Author: xxxxxxxx <xxxxx@xxxxx.com>
Date: Tue Nov 5 11:36:51 2019 +0800
write one
11、更加简单的查看提交的版本信息:
$ git log --pretty=oneline
284da1e66486c6986e0ad6fca36a2e3752f05049 (HEAD -> master) add htree
e0c01fbe642a2389957cb7da5ed190c0c8ade25d add two
9a24fb5dea410372ad4971067e6b9b830699429a write one
12、将现在的版本回退一个版本,也就是把three回退到two:
$ git reset --hard HEAD^ # 回退到上一个版本
HEAD is now at e0c01fb add two
13、查看是否回退到了原来的版本:
$ cat one.txt # 查看此时文件的内容,是不是回退到了第二个版本
one
two
14、再次回到第三个版本,此时需要你记住最近一次的版本号(commit id),查看版本号的命令会展示窗口,当不需要这个命令的时候,会关掉窗口,以后可以将版本号截图,以便后续使用:
$ git reset --hard 284da # 追加到最新版本
HEAD is now at 284da1e add htree
$ cat one.txt
one
two
three
15、如果没有记住版本号,怎么办呢?当然还有后悔药了,使用 git reflog,如下:
$ git reflog # 查看历史版本号
284da1e (HEAD -> master) HEAD@{0}: reset: moving to 284da
e0c01fb HEAD@{1}: reset: moving to HEAD^
284da1e (HEAD -> master) HEAD@{2}: commit: add htree
e0c01fb HEAD@{3}: commit: add two
9a24fb5 HEAD@{4}: commit (initial): write one
-
工作区 & 暂存区
- 工作区
- 一个文件夹就相当于一个工作区;
- 版本库
- 工作区中有一个隐藏目录 .git ,这个不算工作区,而是git的版本库;
- 在版本库中有暂存区,当使用 add one.txt命令时,就是将one.txt放入了暂存区;
- 使用 git commit -m "xxx" 提交之后,就是将暂存区的内容提交到了分支;
-
管理修改
16、给 one.txt 增加一行内容,在查看状态:
$ git add one.txt
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: one.txt
17、再次修改 one.txt 文件,进行提交,注意哦:修改之后只提交并没有add哦:
$ vi one.txt
$ git commit -m "git add four"
[master 53ce142] git add four
1 file changed, 1 insertion(+)
18、查看现在的状态:有新的修改但是并未放在暂存区:
$ 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: one.txt
no changes added to commit (use "git add" and/or "git commit -a")
$ git diff HEAD -- one.txt # 查看工作区与版本库里面最新版本的区别
diff --git a/one.txt b/one.txt
index f384549..b2f931a 100644
--- a/one.txt
+++ b/one.txt
@@ -2,3 +2,4 @@ one
two
three
four
+five
19、如果在add之前,发现自己即将提交的有问题,则需要回退到上一个版本,使用一下方式进行回退:
$ git checkout -- one.txt # 回退到下一个版本
$ git status # 查看目前的状态
On branch master
nothing to commit, working tree clean
注意:不能在提交之后就立即进行 git checkout -- one.txt ,可以尝试,但是不会成功。
20、在add之后发现填写的内容有误,可以通过如下的方式进行解决:
$ git reset HEAD # 什么都不加的话是代表所有add的文件,如果加参数的话,加的是路径
Unstaged changes after reset:
M one.txt
$ 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: one.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
.swp
no changes added to commit (use "git add" and/or "git commit -a")
从上面可以看出,进行了撤销之后,查看它的状态,它变为了没有准备提交的文件,可以理解为它现在已经撤销了add的操作,出现在工作区了,此时需要我们使用工作区撤销的命令对one.txt文件进行回退;
如果在首次提交之后,有二次提交可以使用如下的顺序操作:第一次修改—> git add —> 第二次修改 —> git add —> git commit
21、查看工作区和版本库里面最新版本的区别,适用于:第一次修改 —> git add —> 第二次修改 —> git commit,使用如下命令:
$ git diff HEAD -- one.txt # 查看工作区和版本库中最新版本的差别
diff --git a/one.txt b/one.txt
index b566061..2019eda 100644
--- a/one.txt
+++ b/one.txt
@@ -4,3 +4,4 @@ three
four
five
six
+seven
22、删除文件,共有两种情况
1. 第一种情况,add、commit之后,在工作区删除了文件,之后发现自己删除错了,这可怎么办?辛亏在版本库中还有文件,此时可以将版本库中的文件更新到本地工作区:
$ git add two.txt
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: two.txt
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: one.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
.swp
$ git commit -m "add two.txt"
[master 3d44486] add two.txt
1 file changed, 1 insertion(+)
$ rm two.txt # 删除在工作区的two.txt文件
$ git checkout -- two.txt # 从版本库中拉出在工作区删除的文件
2. 这个文件我是不准备体检到版本库的,可是就是误打误撞给提交了。此时,我需要怎么办呢?那当然是在工作区删除,之后也在git仓库中删除它:
$ rm two.txt # 在工作区删除two.txt
$ git rm two.txt # 在git中 删除这个文件
$ git status # 删除之后查看此时的状态
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
deleted: two.txt
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: one.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
.swp
$ git commit -m "del two" # 删除之后,再提交一次,彻底删除