常用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}}]}