版本控制介紹
集中式版本控制
- 問題：單點故障
分布式版本控制
Git安裝
Git結構
image.png
Git和代碼托管中心
代碼托管中心的任務：維護遠程庫
- 局域網環(huán)境下
- GitLab服務器
- 外網環(huán)境下
- Github
- 碼云
本地庫和遠程庫
image.png
image.png
Git命令行操作
- 本地庫初始化
- 命令：git init
- 注意：.git目錄中存放的是本地庫相關的子目錄和文件蛛勉，不要刪除，也不要胡亂修改。
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace
$ mkdir EmptyDemo
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace
$ cd EmptyDemo/
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo
$ git init
Initialized empty Git repository in E:/IdeaProjects/workspace/EmptyDemo/.git/
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ ll .git/
total 7
-rw-r--r-- 1 lenovo 197609 130 7月 1 10:06 config
-rw-r--r-- 1 lenovo 197609 73 7月 1 10:06 description
-rw-r--r-- 1 lenovo 197609 23 7月 1 10:06 HEAD
drwxr-xr-x 1 lenovo 197609 0 7月 1 10:06 hooks/
drwxr-xr-x 1 lenovo 197609 0 7月 1 10:06 info/
drwxr-xr-x 1 lenovo 197609 0 7月 1 10:06 objects/
drwxr-xr-x 1 lenovo 197609 0 7月 1 10:06 refs/
- 設置簽名
- 形式
- 用戶名
- Email地址
- 作用：區(qū)分不同開發(fā)人員的身份
- 辨析：這里設置的簽名和登陸遠程庫（代碼托管中心）的賬號但骨、密碼沒有任何關系幢哨。
- 命令
- 項目級別/倉庫級別：僅在當前本地庫范圍內有效
- git config user.name mrwang
- git config user.email goodMorning_MrWang@example.com
- 系統(tǒng)用戶級別：登陸當前操作系統(tǒng)的用戶范圍
- git config --global user.name mrwang
- git config --global user.email goodMorning_MrWang@example.com
- 級別優(yōu)先級
- 就近原則：項目級別優(yōu)先于系統(tǒng)用戶級別，二者都有時采用項目級別的簽名
- 如果只有系統(tǒng)用戶級別的簽名，就以系統(tǒng)用戶級別的簽名為準
- 二者都沒有是不允許的
- 項目級別/倉庫級別：僅在當前本地庫范圍內有效
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git config user.name mrwang
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git config user.email goodMorning_MrWang@example.com
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ cat .git/config
[core]
repositoryformatversion = 0
filemode = false
bare = false
logallrefupdates = true
symlinks = false
ignorecase = true
[user]
name = mrwang
email = goodMorning_MrWang@example.com
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git config --global user.name mrwang
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git config --global user.email goodMorning_MrWang@example.com
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ cd ~
lenovo@Maximus-PC MINGW64 ~
$ pwd
/c/Users/lenovo
lenovo@Maximus-PC MINGW64 ~
$ ls -lA |grep git
-rw-r--r-- 1 lenovo 197609 153 7月 1 11:12 .gitconfig
lenovo@Maximus-PC MINGW64 ~
$ cat .gitconfig
[user]
name = mrwang
email = goodMorning_MrWang@example.com
[core]
autocrlf = true
excludesfile = C:\\Users\\lenovo\\Documents\\gitignore_global.txt
添加提交以及查看狀態(tài)操作
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
No commits yet
nothing to commit (create/copy files and use "git add" to track)
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ vim good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
good.txt
nothing added to commit but untracked files present (use "git add" to track)
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git add good.txt
warning: LF will be replaced by CRLF in good.txt.
The file will have its original line endings in your working directory.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git rm --cached good.txt
rm 'good.txt'
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
good.txt
nothing added to commit but untracked files present (use "git add" to track)
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ ll
total 1
-rw-r--r-- 1 lenovo 197609 24 7月 2 08:04 good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git add good.txt
warning: LF will be replaced by CRLF in good.txt.
The file will have its original line endings in your working directory.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git commit good.txt
warning: LF will be replaced by CRLF in good.txt.
The file will have its original line endings in your working directory.
[master (root-commit) 488d18f] My first commit. New file good.txt.
1 file changed, 3 insertions(+)
create mode 100644 good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
nothing to commit, working tree clean
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ vim good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ 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: good.txt
no changes added to commit (use "git add" and/or "git commit -a")
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git add good.txt
warning: LF will be replaced by CRLF in good.txt.
The file will have its original line endings in your working directory.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: good.txt
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git commit -m "My second commit, modify good.txt" good.txt
warning: LF will be replaced by CRLF in good.txt.
The file will have its original line endings in your working directory.
[master 7752881] My second commit, modify good.txt
1 file changed, 1 insertion(+)
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$
版本穿梭
查看歷史記錄的幾種方式
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git log
commit 91e905998a46c668b511925aa493e4b957b8b69c (HEAD -> master)
Author: mrwang <goodMorning_MrWang@example.com>
Date: Mon Jul 2 09:30:01 2018 +0800
insert fffffff edit
commit 594e334173b17a770bbeaf60239a9d70241cc783
Author: mrwang <goodMorning_MrWang@example.com>
Date: Mon Jul 2 09:29:25 2018 +0800
insert eeeeeee edit
commit b2025ce2431e90faefd3bc474b5033151f573516
Author: mrwang <goodMorning_MrWang@example.com>
Date: Mon Jul 2 09:24:06 2018 +0800
for test history
commit 77528812922c4c114db3aec3b0a33b709a7c3ae0
Author: mrwang <goodMorning_MrWang@example.com>
Date: Mon Jul 2 09:13:35 2018 +0800
My second commit, modify good.txt
commit 488d18f388b275815b934402fca31e4a51143c56
Author: mrwang <goodMorning_MrWang@example.com>
Date: Mon Jul 2 08:55:07 2018 +0800
My first commit. New file good.txt.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git log --pretty=oneline
91e905998a46c668b511925aa493e4b957b8b69c (HEAD -> master) insert fffffff edit
594e334173b17a770bbeaf60239a9d70241cc783 insert eeeeeee edit
b2025ce2431e90faefd3bc474b5033151f573516 for test history
77528812922c4c114db3aec3b0a33b709a7c3ae0 My second commit, modify good.txt
488d18f388b275815b934402fca31e4a51143c56 My first commit. New file good.txt.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git log --oneline
91e9059 (HEAD -> master) insert fffffff edit
594e334 insert eeeeeee edit
b2025ce for test history
7752881 My second commit, modify good.txt
488d18f My first commit. New file good.txt.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git reflog
91e9059 (HEAD -> master) HEAD@{0}: commit: insert fffffff edit
594e334 HEAD@{1}: commit: insert eeeeeee edit
b2025ce HEAD@{2}: commit: for test history
7752881 HEAD@{3}: commit: My second commit, modify good.txt
488d18f HEAD@{4}: commit (initial): My first commit. New file good.txt.
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$
版本前進后退
-
本質
image.png - 基于索引值操作[推薦]
git reset --hard [局部索引值]- 例如：
git reset --hard a6ace91
- 使用^符號：只能后退
git reset --hard HEAD^- 注：一個^表示后退一步锁摔，^^表示后退兩步巡验，n個^表示后退n步
- 使用~符號：只能后退
git reset --hard HEAD~n- 注：表示后退n步
基本操作
- 狀態(tài)查看操作
git status
查看工作區(qū)际插、暫存區(qū)狀態(tài) - 添加操作
git add [file]
將工作區(qū)的“新建/修改”添加到暫存區(qū) - 提交操作
git commit -m "commit message" [file]
將暫存區(qū)的內容提交到本地庫 - 查看歷史記錄
git loglog多屏顯示控制方式：空格 -> 向下翻頁，b -> 向上翻頁深碱，q -> 退出
git log --pretty=oneline
git log --oneline
git reflogHEAD@{移動到當前版本需要多少步} - 版本前進后退
- 基于索引值操作[推薦]
git reset --hard [局部索引值]- 例如：
git reset --hard a6ace91
- 使用^符號：只能后退
git reset --hard HEAD^- 注：一個^表示后退一步腹鹉，^^表示后退兩步，n個^表示后退n步
- 使用~符號：只能后退
git reset --hard HEAD~n- 注：表示后退n步
- reset命令的三個參數(shù)對比
- --soft
- 僅僅在本地庫移動HEAD指針
- --mixed：
- 在本地庫移動HEAD指針
- 重置暫存區(qū)
- --hard
- 在本地庫移動HEAD指針
- 重置暫存區(qū)
- 重置工作區(qū)
- 刪除文件并找回
- 前提：刪除前敷硅，文件存在時的狀態(tài)提交到了本地庫功咒。
- 操作：`git reset --hard [需找回文件存在的指針位置]
- 刪除操作已經提交到本地庫：指針位置指向歷史記錄
- 刪除操作尚未提交到本地庫：指針位置使用HEAD
- 比較文件差異
-
git diff [file name]: 將工作區(qū)中的文件和暫存區(qū)進行比較 -
git diff [本地庫中歷史版本] [file name]: 將工作區(qū)中的文件和本地庫歷史記錄進行比較 - 不帶文件名比較多個文件
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git diff good.txt
diff --git a/good.txt b/good.txt
index baf19f6..74747ba 100644
--- a/good.txt
+++ b/good.txt
@@ -5,3 +5,4 @@ UUUUUUU
ddddddd
eeeeeee
fffffff
+*******
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git diff HEAD^ good.txt
diff --git a/good.txt b/good.txt
index baf19f6..74747ba 100644
--- a/good.txt
+++ b/good.txt
@@ -5,3 +5,4 @@ UUUUUUU
ddddddd
eeeeeee
fffffff
+*******
lenovo@Maximus-PC MINGW64 /e/IdeaProjects/workspace/EmptyDemo (master)
$ git diff
warning: LF will be replaced by CRLF in apple.txt.
The file will have its original line endings in your working directory.
diff --git a/apple.txt b/apple.txt
index 4c479de..656d67d 100644
--- a/apple.txt
+++ b/apple.txt
@@ -1 +1,2 @@
apple
+-----
diff --git a/good.txt b/good.txt
index baf19f6..74747ba 100644
--- a/good.txt
+++ b/good.txt
@@ -5,3 +5,4 @@ UUUUUUU
ddddddd
eeeeeee
fffffff
+*******
