GIT 常用命令

<h1 class="postTitle"><a id="cb_post_title_url" class="postTitle2" href="https://www.cnblogs.com/zhangfu/articles/10335471.html"&gt;GIT 常用命令
<div class="postBody">
<div id="cnblogs_post_body" class="blogpost-body">

一、新建代码库

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个目录，将其初始化为Git代码库

$ git init <span class="token punctuation">[project<span class="token operator">-name<span class="token punctuation">]

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 下载一个项目和它的整个代码历史

<span style="color: #ff0000">$ git <span class="hljs-built_in"><span class="hljs-built_in">clone <span class="token punctuation">[url<span class="token punctuation">]

二、配置

Git的设置文件为.gitconfig，它可以在用户主目录下（全局配置），也可以在项目目录下（项目配置）。

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 编辑Git配置文件

$ git config <span class="token operator">-e <span class="token punctuation">[<span class="token operator">--global<span class="token punctuation">]

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 设置提交代码时的用户信息

$ git config <span class="token punctuation">[<span class="token operator">--global<span class="token punctuation">] user<span class="token punctuation">.name <span class="token string"><span class="hljs-string"><span class="hljs-string">"[name]"

$ git config <span class="token punctuation">[<span class="token operator">--global<span class="token punctuation">] user<span class="token punctuation">.email <span class="token string"><span class="hljs-string"><span class="hljs-string">"[email address]"

三、增加/删除文件

$ git add [file1] [file2] ...
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 添加指定目录到暂存区，包括子目录

$ git add <span class="token punctuation">[dir<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 添加当前目录的所有文件到暂存区

<span style="color: #ff0000">$ git add <span class="token punctuation"><span style="color: #ff0000">.
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 添加每个变化前，都会要求确认

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 对于同一个文件的多处变化，可以实现分次提交

$ git add <span class="token operator">-p
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 删除工作区文件，并且将这次删除放入暂存区

$ git rm <span class="token punctuation">[file1<span class="token punctuation">] <span class="token punctuation">[file2<span class="token punctuation">] <span class="token punctuation">.<span class="token punctuation">.<span class="token punctuation">.
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 停止追踪指定文件，但该文件会保留在工作区

$ git rm <span class="token operator">--cached <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 改名文件，并且将这个改名放入暂存区

$ git mv <span class="token punctuation">[file<span class="token operator">-original<span class="token punctuation">] <span class="token punctuation">[file<span class="token operator">-renamed<span class="token punctuation">]

四、代码提交

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 提交暂存区的指定文件到仓库区

<span style="color: #ff0000">$ git commit <span class="token punctuation"><span style="color: #ff0000">[file1<span class="token punctuation"><span style="color: #ff0000">] <span class="token punctuation"><span style="color: #ff0000">[file2<span class="token punctuation"><span style="color: #ff0000">] <span class="token punctuation"><span style="color: #ff0000">.<span class="token punctuation"><span style="color: #ff0000">.<span class="token punctuation"><span style="color: #ff0000">. <span class="token operator"><span style="color: #ff0000">-m <span class="token punctuation"><span style="color: #ff0000">[message<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 提交工作区自上次commit之后的变化，直接到仓库区

$ git commit <span class="token operator">-a
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 提交时显示所有diff信息

$ git commit <span class="token operator">-v
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 使用一次新的commit，替代上一次提交

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 如果代码没有任何新变化，则用来改写上一次commit的提交信息

$ git commit <span class="token operator">--amend <span class="token operator">-m <span class="token punctuation">[message<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重做上一次commit，并包括指定文件的新变化

$ git commit <span class="token operator">--amend <span class="token punctuation">[file1<span class="token punctuation">] <span class="token punctuation">[file2<span class="token punctuation">] <span class="token punctuation">.<span class="token punctuation">.<span class="token punctuation">.

五、分支

$ git branch

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 列出所有本地分支和远程分支

<span style="color: #ff0000">$ git branch <span class="token operator"><span style="color: #ff0000">-a

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个分支，但依然停留在当前分支

<span style="color: #ff0000">$ git branch <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token operator"><span style="color: #ff0000">-name<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个分支，并切换到该分支

<span style="color: #ff0000">$ git checkout <span class="token operator"><span style="color: #ff0000">-b <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个分支，指向指定commit

$ git branch <span class="token punctuation">[branch<span class="token punctuation">] <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个分支，与指定的远程分支建立追踪关系

$ git branch <span class="token operator">--track <span class="token punctuation">[branch<span class="token punctuation">] <span class="token punctuation">[remote<span class="token operator">-branch<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 切换到指定分支，并更新工作区

<span style="color: #ff0000">$ git checkout <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token operator"><span style="color: #ff0000">-name<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 切换到上一个分支

<span style="color: #ff0000">$ git checkout <span class="token operator"><span style="color: #ff0000">-
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 建立追踪关系，在现有分支与指定的远程分支之间

$ git branch <span class="token operator">--<span class="token keyword"><span class="hljs-built_in"><span class="hljs-built_in">set<span class="token operator">-upstream <span class="token punctuation">[branch<span class="token punctuation">] <span class="token punctuation">[remote<span class="token operator">-branch<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 合并指定分支到当前分支

$ git merge <span class="token punctuation">[branch<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 选择一个commit，合并进当前分支

$ git cherry<span class="token operator">-pick <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 删除分支

<span style="color: #ff0000">$ git branch <span class="token operator"><span style="color: #ff0000">-d <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token operator"><span style="color: #ff0000">-name<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 删除远程分支

$ git push origin <span class="token operator">--delete <span class="token punctuation">[branch<span class="token operator">-name<span class="token punctuation">]

$ git branch <span class="token operator">-dr <span class="token punctuation">[remote<span class="token operator">/branch<span class="token punctuation">]

六、标签

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个tag在当前commit

$ git tag <span class="token punctuation">[tag<span class="token punctuation">]

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个tag在指定commit

$ git tag <span class="token punctuation">[tag<span class="token punctuation">] <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 删除本地tag

$ git tag <span class="token operator">-d <span class="token punctuation">[tag<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 删除远程tag

$ git push origin <span class="token punctuation">:refs<span class="token operator">/tags<span class="token operator">/<span class="token punctuation">[tagName<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 查看tag信息

$ git show <span class="token punctuation">[tag<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 提交指定tag

$ git push <span class="token punctuation">[remote<span class="token punctuation">] <span class="token punctuation">[tag<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 提交所有tag

$ git push <span class="token punctuation">[remote<span class="token punctuation">] <span class="token operator">--tags
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个分支，指向某个tag

$ git checkout <span class="token operator">-b <span class="token punctuation">[branch<span class="token punctuation">] <span class="token punctuation">[tag<span class="token punctuation">]

七、查看信息

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示当前分支的版本历史

<span style="color: #ff0000">$ git <span class="hljs-built_in"><span class="hljs-built_in">log



<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示commit历史，以及每次commit发生变更的文件

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token operator">--<span class="hljs-built_in"><span class="hljs-built_in">stat
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 搜索提交历史，根据关键词

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token operator">-S <span class="token punctuation">[keyword<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某个commit之后的所有变动，每个commit占据一行

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token punctuation">[tag<span class="token punctuation">] HEAD <span class="token operator">--pretty<span class="token operator">=format<span class="token punctuation">:<span class="token operator">%s
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某个commit之后的所有变动，其"提交说明"必须符合搜索条件

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token punctuation">[tag<span class="token punctuation">] HEAD <span class="token operator">--grep feature
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某个文件的版本历史，包括文件改名

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token operator">--follow <span class="token punctuation">[file<span class="token punctuation">]

$ git whatchanged <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示指定文件相关的每一次diff

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token operator">-p <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示过去5次提交

$ git <span class="hljs-built_in"><span class="hljs-built_in">log <span class="token operator">-<span class="token number">5 <span class="token operator">--pretty <span class="token operator">--oneline
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示所有提交过的用户，按提交次数排序

$ git shortlog <span class="token operator">-sn
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示指定文件是什么人在什么时间修改过

$ git blame <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示暂存区和工作区的<span class="hljs-comment"><span class="hljs-comment">代码<span class="hljs-comment"><span class="hljs-comment">差异

<span style="color: #ff0000">$ git diff
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示暂存区和上一个commit的差异

$ git diff <span class="token operator">--cached <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示工作区与当前分支最新commit之间的差异

$ git diff HEAD
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示两次提交之间的差异

$ git diff <span class="token punctuation">[first<span class="token operator">-branch<span class="token punctuation">]<span class="token punctuation">.<span class="token punctuation">.<span class="token punctuation">.<span class="token punctuation">[second<span class="token operator">-branch<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示今天你写了多少行代码

$ git diff <span class="token operator">--shortstat <span class="token string"><span class="hljs-string"><span class="hljs-string">"@{0 day ago}"
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某次提交的元数据和内容变化

<span style="color: #ff0000">$ git show <span class="token punctuation"><span style="color: #ff0000">[commit<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某次提交发生变化的文件

$ git show <span class="token operator">--name<span class="token operator">-only <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某次提交时，某个文件的内容

$ git show <span class="token punctuation">[commit<span class="token punctuation">]<span class="token punctuation">:<span class="token punctuation">[filename<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示当前分支的最近几次提交

$ git reflog<span class="hljs-comment"><span class="hljs-comment"># 从本地master拉取代码更新当前分支：branch 一般为master<span style="color: #ff0000"><span class="hljs-comment"><span class="hljs-comment">$ git rebase [branch]

八、远程同步

$ git remote update  --更新远程仓储
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示所有远程仓库

$ git remote <span class="token operator">-v

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 显示某个远程仓库的信息

$ git remote show <span class="token punctuation">[remote<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 增加一个新的远程仓库，并命名

$ git remote add <span class="token punctuation">[shortname<span class="token punctuation">] <span class="token punctuation">[url<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 取回远程仓库的变化，并与本地分支合并

<span style="color: #ff0000">$ git pull <span class="token punctuation"><span style="color: #ff0000">[remote<span class="token punctuation"><span style="color: #ff0000">] <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 上传本地指定分支到远程仓库

<span style="color: #ff0000">$ git push <span class="token punctuation"><span style="color: #ff0000">[remote<span class="token punctuation"><span style="color: #ff0000">] <span class="token punctuation"><span style="color: #ff0000">[branch<span class="token punctuation"><span style="color: #ff0000">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 强行推送当前分支到远程仓库，即使有冲突

$ git push <span class="token punctuation">[remote<span class="token punctuation">] <span class="token operator">--force
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 推送所有分支到远程仓库

$ git push <span class="token punctuation">[remote<span class="token punctuation">] <span class="token operator">--all

九、撤销

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 恢复某个commit的指定文件到暂存区和工作区

$ git checkout <span class="token punctuation">[commit<span class="token punctuation">] <span class="token punctuation">[file<span class="token punctuation">]

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 恢复暂存区的所有文件到工作区

$ git checkout <span class="token punctuation">.
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重置暂存区的指定文件，与上一次commit保持一致，但工作区不变

$ git reset <span class="token punctuation">[file<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重置暂存区与工作区，与上一次commit保持一致

<span style="color: #ff0000">$ git reset <span class="token operator"><span style="color: #ff0000">--hard
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重置当前分支的指针为指定commit，同时重置暂存区，但工作区不变

$ git reset <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重置当前分支的HEAD为指定commit，同时重置暂存区和工作区，与指定commit一致

$ git reset <span class="token operator">--hard <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 重置当前HEAD为指定commit，但保持暂存区和工作区不变

$ git reset <span class="token operator">--keep <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 新建一个commit，用来撤销指定commit

<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 后者的所有变化都将被前者抵消，并且应用到当前分支

$ git revert <span class="token punctuation">[commit<span class="token punctuation">]
<span class="token comment"><span class="hljs-comment"><span class="hljs-comment"># 暂时将未提交的变化移除，稍后再移入

<span style="color: #ff00ff">$ git stash

$ git stash pop

十、其他

（编辑：李大同）

【声明】本站内容均来自网络，其相关言论仅代表作者个人观点，不代表本站立场。若无意侵犯到您的权利，请及时与联系站长删除相关内容!