身為技術人員，都知道Git是干嘛的，從服務端角度它是代碼倉庫，可以多人協作、版本控制、高效處理大型或小型專案所有內容；從客戶端講，它能夠方便管理本地分支、且與服務端代碼的同步，從拉取、合并、提交等等管理分支都靠它！
Git輕量、易于學習，如果不用搭建和維護代碼倉庫的話（運維職責），只要掌握幾個git常用命令即可在作業中輕松應對，
下面簡單介紹幾個概念，同時列出作業中常用命令：
主要概念
快速入門，弄明白以下幾個概念即可：
- 作業區（Working Directory）：就是你在電腦里能看到的目錄，或克隆（clone）下來的目錄；
- 版本庫（Repository）：作業區里面有一個隱藏目錄
.git，這個不是作業區，而是Git的版本庫； - 暫存區（stage）：版本庫中有一個叫stage的暫存區，
git add可以把要提交的內容放到暫存區； - 主分支（master）：版本庫還有一個叫master的主分支，
git commit把暫存區所有內容提交到當前分支；
主要用法
作業中，一般我們提交代碼只要四步：
- 第一步，
git pull拉取代碼，提交代碼前確保和服務端倉庫一致，避免沖突； - 第二步，
git add ./your_file.txt把檔案添加進去，實際就是從作業區提交到暫存區； - 第三步，
git commit -m 'first commit'提交更改，再把暫存區所有內容提交到當前分支（默認master）； - 第四步，
git push [remoteName]推送到遠程倉庫，也就是推到服務端，這樣別人就能拉取pull你的代碼；
常見問題
平時作業也就用到上面四個步驟，當然了凡事有例外，下面說幾個例外的處理辦法：
一、checkout切換分支
git checkout <branch>：切換到你需要的分支（dev、hotfix）
git checkout -b <branch>： 如果沒有分支，加上-b引數表示創建并切換；
參考鏈接：https://git-scm.com/docs/git-checkout
二、git提交后撤銷問題
撤銷得分三種情況：
- 第一，已經修改檔案但未執行
git add的撤銷方法；
我故意在.gitignore檔案修改之后且沒有git add，直接通過git checkout -- <file>撤銷；
但是此命令不會撤銷新建的檔案，因為新建檔案還沒加入到Git管理系統中，
所以git是未知的，自己手動洗掉就好了，
λ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/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: .gitignore
no changes added to commit (use "git add" and/or "git commit -a")
D:\learning\git\work (master -> origin)
λ git checkout -- .gitignore
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
擴展：
命令git checkout -- .gitignore意思就是，把.gitignore檔案在作業區的修改全部撤銷，這里有兩種情況：
一種是.gitignore自修改后還沒有被放到暫存區，現在撤銷修改就回到和版本庫一模一樣的狀態；
一種是.gitignore已經添加到暫存區，又作了修改，現在，撤銷修改就回到添加到暫存區后的狀態，
總之，就是讓這個檔案回到最近一次git commit或git add時的狀態，
參考鏈接：https://www.liaoxuefeng.com/wiki/896043488029600/897889638509536
- 第二，已經修改檔案且
git add的撤銷方法
需要先執行git reset .gitignore撤銷到未git add狀態，再執行第一步即可，
λ git add .gitignore
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: .gitignore
D:\learning\git\work (master -> origin)
λ git reset .gitignore
Unstaged changes after reset:
M .gitignore
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/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: .gitignore
no changes added to commit (use "git add" and/or "git commit -a")
D:\learning\git\work (master -> origin)
λ git checkout -- .gitignore
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
- 第三，Git已經commit如何撤銷：
通過git reset --hard commitid直接回到未修改狀態，
λ git add .gitignore
λ git commit -m "test"
#(省略無用部分)
λ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
D:\learning\git\work (master -> origin)
λ git log
commit b7de9378f39834dbc8304d4a8d30f39a4003c673 (HEAD -> master)
Author: test <[email protected]>
Date: Mon Sep 14 02:59:02 2020 +0800
test
commit b3ed1078e543cdb26b984dac584df9db7553d506 (origin/master, origin/HEAD)
Author: test <[email protected]>
Date: Mon Sep 14 02:39:54 2020 +0800
09142020
D:\learning\git\work (master -> origin)
λ git reset --hard b3ed1078e543cdb26b984dac584df9db7553d506
HEAD is now at b3ed107 09142020
D:\learning\git\work (master -> origin)
λ git log
commit b3ed1078e543cdb26b984dac584df9db7553d506 (HEAD -> master, origin/master, origin/HEAD)
Author: test <[email protected]>
Date: Mon Sep 14 02:39:54 2020 +0800
09142020
D:\learning\git\work (master -> origin)
λ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
三、git stash保存和恢復作業區內容
git stash可以將你已經修改，但不想提交（git push）的代碼臨時保存到堆疊中，也就是回歸到你git pull時的狀態，然后就能隨意切換分支救火，完成后切換回來再git push pop即可恢復之前的修改內容，stash不僅可以恢復到原先開發的分支，也可以恢復到其他任意指定的分支上（可跨分支），
- git stash
保存當前作業進度，會把暫存區和作業區的改動保存起來，
執行完之后再git status，會發現當前是一個干凈的作業區，沒有任何改動，
使用git stash save 'message...'可以添加一些注釋
-
git stash list
顯示保存進度的串列，也就意味著，git stash命令可以多次執行， -
git stash pop
恢復最新的進度到作業區，git默認會把作業區和暫存區的改動都恢復到作業區， -
git stash pop stash@{stash_id}
恢復指定的進度到作業區，stash_id通過git stash list命令得到的
通過git stash pop命令恢復進度后，會洗掉當前進度， -
git stash drop stash@{stash_id}
可以使用git stash drop命令，后面可以跟stash_id
或使用git stash clear命令，洗掉所有快取的stash -
git stash show
查看堆疊中最新保存的stash和當前目錄的差異
舉個例子
- 修改.gitignore檔案，新建test.txt檔案，再執行stash發現新增檔案不會被存盤；
git add之后再stash發現作業區是干凈的；- 說明沒有在git版本控制（git add）中的檔案，不能被git stash 保存；
- 最后通過
git stash pop恢復，
λ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
test.txt
no changes added to commit (use "git add" and/or "git commit -a")
D:\learning\git\timed_tasks (master -> origin)
λ git stash
Saved working directory and index state WIP on master: 542a055 create .gitignore
D:\learning\git\timed_tasks (master -> origin)
λ git status
On branch master
Your branch is up to date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
test.txt
nothing added to commit but untracked files present (use "git add" to track)
D:\learning\git\timed_tasks (master -> origin)
λ git add test.txt
D:\learning\git\timed_tasks (master -> origin)
λ git stash
Saved working directory and index state WIP on master: 542a055 create .gitignore
D:\learning\git\timed_tasks (master -> origin)
λ git stash list
stash@{0}: WIP on master: 542a055 create .gitignore
stash@{1}: WIP on master: 542a055 create .gitignore
stash@{2}: WIP on (no branch): 542a055 create .gitignore
D:\learning\git\timed_tasks (master -> origin)
λ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
D:\learning\git\timed_tasks (master -> origin)
λ git stash show
test.txt | 0
1 file changed, 0 insertions(+), 0 deletions(-)
D:\learning\git\timed_tasks (master -> origin)
λ git stash pop
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: test.txt
Dropped refs/stash@{0} (b69da2894d5e7f511be18277c5a0cd4582fbf453)
D:\learning\git\timed_tasks (master -> origin)
λ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: test.txt
Tip：如果你修改的所有檔案都不想要了怎么辦？可通過git stash清空，懂吧？
λ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: test.txt
D:\learning\git\timed_tasks (master -> origin)
λ git stash
Saved working directory and index state WIP on master: 542a055 create .gitignore
D:\learning\git\timed_tasks (master -> origin)
λ git stash clear
D:\learning\git\timed_tasks (master -> origin)
λ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
----by 鋼鐵 [email protected]
參考資料：
Git官方檔案：https://git-scm.com/docs
廖雪峰Git教程：https://www.liaoxuefeng.com/wiki/896043488029600
轉載請註明出處，本文鏈接：https://www.uj5u.com/qita/35193.html
標籤：其他