常用Git命令速查手冊

{"type":"doc","content":[{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"初始化Git"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"查看Git版本："},{"type":"codeinline","content":[{"type":"text","text":"git --version"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"設置用戶名和郵箱："}]}]}]},{"type":"codeblock","attrs":{"lang":"shell"},"content":[{"type":"text","text":"git config --global user.name \"Your Name\"\ngit config --global user.email \"[email protected]\""}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"初始化倉庫"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"創建並初始化本地倉庫："}]}]}]},{"type":"codeblock","attrs":{"lang":"shell"},"content":[{"type":"text","text":"mkdir GitResp && cd GitResp\ngit init"}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"add命令"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"將文件提交到暫存區："},{"type":"codeinline","content":[{"type":"text","text":"git add xxx"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"將所有修改提交到暫存區："},{"type":"codeinline","content":[{"type":"text","text":"git add ."}]}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"commit命令"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"將暫存區的文件提交到本地倉庫："},{"type":"codeinline","content":[{"type":"text","text":"git commit xxx -m \"本次提交說明\""}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"將暫存區的所有內容提交到本地倉庫："},{"type":"codeinline","content":[{"type":"text","text":"git commit -m \"本次提交說明\""}]}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"狀態"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"查看工作區和暫存區的狀態："},{"type":"codeinline","content":[{"type":"text","text":"git status"}]}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"日誌"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"查看日誌(分頁時，"},{"type":"codeinline","content":[{"type":"text","text":"空格"}]},{"type":"text","text":"下一頁，"},{"type":"codeinline","content":[{"type":"text","text":"b"}]},{"type":"text","text":"上一頁，"},{"type":"codeinline","content":[{"type":"text","text":"q"}]},{"type":"text","text":"退出)"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"詳細顯示："},{"type":"codeinline","content":[{"type":"text","text":"git log"}]},{"type":"codeinline"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"每條日誌一行顯示："},{"type":"codeinline","content":[{"type":"text","text":"git log --pretty=oneline"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"每條日誌一行顯示(簡化版本號)："},{"type":"codeinline","content":[{"type":"text","text":"git log --oneline"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"每條日誌一行顯示(簡化版本號+"},{"type":"codeinline","content":[{"type":"text","text":"Head@{數字}"}]},{"type":"text","text":")："},{"type":"codeinline","content":[{"type":"text","text":"git reflog"}]},{"type":"text","text":"，其中數字表示當前版本回退到歷史版本需要的步數"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"版本回退"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"版本回退："},{"type":"codeinline","content":[{"type":"text","text":"git reset --hard 版本號"}]},{"type":"text","text":"，其中"},{"type":"codeinline","content":[{"type":"text","text":"hard"}]},{"type":"text","text":"表示移動本地倉庫的"},{"type":"codeinline","content":[{"type":"text","text":"Head"}]},{"type":"text","text":"指針的同時，重置暫存區和工作區，版本號可通過"},{"type":"codeinline","content":[{"type":"text","text":"git reflog"}]},{"type":"text","text":"命令查看"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"刪除文件"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"刪除工作區中的文件，需要同步到暫存區("},{"type":"codeinline","content":[{"type":"text","text":"add"}]},{"type":"text","text":"命令)和本地倉庫("},{"type":"codeinline","content":[{"type":"text","text":"commit"}]},{"type":"text","text":"命令)"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"找回文件"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"找回本地倉庫被刪除的文件(即刪除操作已同步到暫存區和本地倉庫)，使用版本回退命令即可"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"找回暫存區被刪除的文件(即刪除操作只同步到了暫存區)，使用版本回退命令即可"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"diff命令"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"比較工作區和暫存區中文件的差異："},{"type":"codeinline","content":[{"type":"text","text":"git diff xxx"}]},{"type":"text","text":"，其中Git是按照行爲單位管理數據的，如果在文件的某一行添加了內容，那麼"},{"type":"codeinline","content":[{"type":"text","text":"diff"}]},{"type":"text","text":"命令顯示的就是先刪除了一行，又添加了一行"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"比較工作區和暫存區中所有文件的差異："},{"type":"codeinline","content":[{"type":"text","text":"git diff"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"比較暫存區和本地倉庫中文件的差異："},{"type":"codeinline","content":[{"type":"text","text":"git diff 版本號 xxx"}]},{"type":"text","text":"，如果要比較暫存區和本地倉庫當前版本中文件的差異，版本號可用"},{"type":"codeinline","content":[{"type":"text","text":"HEAD"}]},{"type":"text","text":"代替"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"分支"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"查看分支："},{"type":"codeinline","content":[{"type":"text","text":"git branch -v"}]},{"type":"text","text":"，如果有多個分支，則帶有星號的爲當前分支"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"創建分支："},{"type":"codeinline","content":[{"type":"text","text":"git branch xxx"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"切換分支："},{"type":"codeinline","content":[{"type":"text","text":"git checkout xxx"}]},{"type":"text","text":"，如果要切換到主分支的話，"},{"type":"codeinline","content":[{"type":"text","text":"xxx"}]},{"type":"text","text":"就爲"},{"type":"codeinline","content":[{"type":"text","text":"master"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"刪除分支："},{"type":"codeinline","content":[{"type":"text","text":"git branch -d xxx"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"合併分支："},{"type":"codeinline","content":[{"type":"text","text":"git merge xxx"}]}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"衝突"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"解決衝突步驟："}]}]}]},{"type":"numberedlist","attrs":{"start":1,"normalizeStart":1},"content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":1,"align":null,"origin":null},"content":[{"type":"text","text":"編輯發生衝突的文件"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":2,"align":null,"origin":null},"content":[{"type":"text","text":"將工作區中發生衝突的文件添加到暫存區"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":3,"align":null,"origin":null},"content":[{"type":"text","text":"進行"},{"type":"codeinline","content":[{"type":"text","text":"commit"}]},{"type":"text","text":"操作："},{"type":"codeinline","content":[{"type":"text","text":"git commit -m \"本次提交說明\""}]},{"type":"text","text":"，注意不能帶文件名"}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"遠程倉庫"}]},{"type":"bulletedlist","content":[{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":1,"align":null,"origin":null},"content":[{"type":"text","text":"別名："}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":1,"align":null,"origin":null},"content":[{"type":"text","text":"查看別名："},{"type":"codeinline","content":[{"type":"text","text":"git remote -v"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":1,"align":null,"origin":null},"content":[{"type":"text","text":"給遠程倉庫起別名："},{"type":"codeinline","content":[{"type":"text","text":"git remote add xxx https://github.com/yyy/zzz.git"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"推送："},{"type":"codeinline","content":[{"type":"text","text":"git push 遠程倉庫別名 分支"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"推送到遠程倉庫的"},{"type":"codeinline","content":[{"type":"text","text":"master"}]},{"type":"text","text":"分支："},{"type":"codeinline","content":[{"type":"text","text":"git push"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"克隆："},{"type":"codeinline","content":[{"type":"text","text":"git clone 遠程倉庫地址"}]},{"type":"text","text":"，實際上克隆操作做了如下三件事"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"初始化本地倉庫"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"將遠程倉庫內容完整的克隆到本地倉庫"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":1,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"創建遠程倉庫的別名爲"},{"type":"codeinline","content":[{"type":"text","text":"origin"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"抓取遠程倉庫："},{"type":"codeinline","content":[{"type":"text","text":"git fetch 遠程倉庫別名 分支"}]},{"type":"text","text":"，抓取操作只是將遠程倉庫的內容下載到本地，並不會進行合併操作，也就是說工作區中內容並沒有更新，還是原先的內容"}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"切換到遠程倉庫的某個分支："},{"type":"codeinline","content":[{"type":"text","text":"git checkout 遠程倉庫別名/分支"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"合併遠程倉庫的某個分支："},{"type":"codeinline","content":[{"type":"text","text":"git merge 遠程倉庫別名/分支"}]}]}]},{"type":"listitem","content":[{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null},"content":[{"type":"text","text":"拉取："},{"type":"codeinline","content":[{"type":"text","text":"git pull 遠程倉庫別名 分支"}]},{"type":"text","text":"，實際上"},{"type":"codeinline","content":[{"type":"text","text":"pull"}]},{"type":"text","text":"="},{"type":"codeinline","content":[{"type":"text","text":"fetch"}]},{"type":"text","text":"+"},{"type":"codeinline","content":[{"type":"text","text":"merge"}]}]}]}]},{"type":"heading","attrs":{"align":null,"level":2},"content":[{"type":"text","text":"常用步驟"}]},{"type":"codeblock","attrs":{"lang":"shell"},"content":[{"type":"text","text":"git status\ngit add .\ngit commit -m \"本次提交說明\"\ngit push"}]},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"horizontalrule"},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"image","attrs":{"src":"https://static001.geekbang.org/infoq/8d/8d3e8fd10661c6bffbea7c0a00db4c84.png","alt":null,"title":null,"style":null,"href":null,"fromPaste":true,"pastePass":true}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}},{"type":"paragraph","attrs":{"indent":0,"number":0,"align":null,"origin":null}}]}