本文最后更新于 2 分钟前，文中所描述的信息可能已发生改变。
Git Basics
| 命令 | 说明 |
|---|---|
git init <directory> | 在指定的目录下创建一个空的git repo。不带参数将在当前目录下创建一个git repo。 |
git clone <repo> | 克隆一个指定repo到本地。指定的repo可以是本地文件系统或者由HTTP或SSH指定的远程路径。 |
git config user.name <name> | 针对当前repo配置用户名。使用–global参数将配置全局用户名。 |
git add <directory> | 将指定目录的所有修改加入到下一次commit中。把<directory>替换成<file>将添加指定文件的修改。 |
git commit -m "<message>" | 提交暂存区的修改，使用指定的<message>作为提交信息，而不是打开文本编辑器输入提交信息。 |
git status | 显示哪些文件已被staged、未被staged以及未跟踪(untracked)。 |
git log | 以缺省格式显示全部commit历史。更多自定义参数请参考后续部分。 |
Git Diff
| 命令 | 说明 |
|---|---|
git diff | 比较工作区和暂存区的修改。 |
git diff HEAD | 比较工作区和上一次commit后的修改。 |
git diff --cached | 比较暂存区和上一次commit后的修改。 |
Undoing Changes
| 命令 | 说明 |
|---|---|
git revert <commit> | 对指定<commit>创建一个undo的commit，并应用到当前分支。 |
git reset <file> | 将<file>从暂存区移除，但保持工作区不变。此操作不会修改工作区的任何文件。 |
Rewriting Git History
| 命令 | 说明 |
|---|---|
git commit -m <message> --amend | 将当前staged修改合并到最近一次的commit中。 |
git rebase <base> | 基于<base>对当前分支进行rebase。<base>可以是commit、分支名称、tag或相对于HEAD的commit。 |
git reflog | 显示本地repo的所有commit日志。 |
Git Branches
| 命令 | 说明 |
|---|---|
git branch | 显示本地repo的所有分支。 |
git switch -c <branch> | 创建并切换到一个新的名为<branch>的分支。去掉-c参数将切换到一个已有分支。 |
git merge <branch> | 将指定<branch>分支合并到当前分支。 |
Remote Repositories
| 命令 | 说明 |
|---|---|
git remote add <name> <url> | 添加一个新的远程连接。添加后可使用<name>作为指定<url>远程连接的名称。 |
git fetch <remote> <branch> | 从指定<remote>抓取指定<branch>的所有commit到本地repo。去掉<branch>将抓取远程所有分支的修改。 |
git pull <remote> | 从指定<remote>抓取所有分支的commit并立刻合并到本地repo。 |
git push <remote> <branch> | 将本地指定<branch>推送到指定远程<remote>。如果远程没有对应的分支，将自动在远程创建此分支。 |
Git Config
| 命令 | 说明 |
|---|---|
git config --global user.name <name> | 配置当前用户名，使用–global参数将针对当前系统登录用户生效。 |
git config --global user.email <email> | 配置当前用户Email。 |
git config --global alias.<alias-name> <git-command> | 配置一个git命令的快捷方式。例如：配置”alias.glog log --graph --oneline”使”git glog”相当于”git log --graph --oneline”。 |
git config --system core.editor <editor> | 配置文本编辑器，例如vi，在必要时自动打开此文本编辑器。 |
git config --global --edit | 打开当前用户的git全局配置并编辑。 |
Git Log
| 命令 | 说明 |
|---|---|
git log -<limit> | 限制log的显示数量。例如：”git log -5”仅显示最新5条commit。 |
git log --oneline | 每行显示一条commit。 |
git log --author="<pattern>" | 按提交者名字搜索并显示commit。 |
git log --grep="<pattern>" | 按指定内容搜索并显示commit。 |
git log <since>..<until> | 显示指定范围的commit。范围参数可以是commit ID、分支名称、HEAD或任意相对位置。 |
git log -- <file> | 仅显示包含指定文件修改的commit。 |
git log --graph | 使用–graph参数显示图形化的branch信息。 |
Git Reset
| 命令 | 说明 |
|---|---|
git reset | 移除所有暂存区的修改，但不会修改工作区。 |
git reset --hard | 移除所有暂存区的修改，并强制删除所有工作区的修改。 |
git reset <commit> | 将当前分支回滚到指定<commit>，清除暂存区的修改，但保持工作区状态不变。 |
git reset --hard <commit> | 将当前分支回滚到指定<commit>，清除暂存区的修改，并强制删除所有工作区的修改。 |
Git Rebase
| 命令 | 说明 |
|---|---|
git rebase -i <base> | 以交互模式对当前分支做rebase。 |
Git Pull
| 命令 | 说明 |
|---|---|
git pull --rebase <remote> | 抓取所有远程分支，并以rebase模式并入本地repo而不是merge。 |
Git Push
| 命令 | 说明 |
|---|---|
git push <remote> --force | 将本地分支推送到远程。不要使用–force参数，除非你完全明白此操作的后果。 |
git push <remote> --tags | 使用push命令并不会自动将本地tag推送到远程。加上–tags参数会将所有本地tag推送到远程。 |
Git Basics
| Command | Description |
|---|---|
git init <directory> | Create empty Git repo in specified directory. Run with no arguments to initialize the current directory as a git repository. |
git clone <repo> | Clone repo located at <repo> onto local machine. Original repo can be located on the local filesystem or on a remote machine via HTTP or SSH. |
git config user.name <name> | Define author name to be used for all commits in current repo. Devs commonly use --global flag to set config options for current user. |
git add <directory> | Stage all changes in <directory> for the next commit. Replace <directory> with a <file> to change a specific file. |
git commit -m "<message>" | Commit the staged snapshot, but instead of launching a text editor, use <message> as the commit message. |
git status | List which files are staged, unstaged, and untracked. |
git log | Display the entire commit history using the default format. For customization see additional options. |
Git Diff
| Command | Description |
|---|---|
git diff | Show unstaged changes between your index and working directory. |
git diff HEAD | Show difference between working directory and last commit. |
git diff --cached | Show difference between staged changes and last commit. |
Undoing Changes
| Command | Description |
|---|---|
git revert <commit> | Create new commit that undoes all of the changes made in <commit>, then apply it to the current branch. |
git reset <file> | Remove <file> from the staging area, but leave the working directory unchanged. This unstages a file without overwriting any changes. |
Rewriting Git History
| Command | Description |
|---|---|
git commit -m <message> --amend | Replace the last commit with the staged changes and last commit combined. |
git rebase <base> | Rebase the current branch onto <base>. <base> can be a commit ID, branch name, a tag, or a relative reference to HEAD. |
git reflog | Show a log of changes to the local repository’s HEAD. |
Git Branches
| Command | Description |
|---|---|
git branch | List all of the branches in your repo. |
git switch -c <branch> | Create and switch to a new branch named <branch>. Drop the -c flag to switch to an existing branch. |
git merge <branch> | Merge <branch> into the current branch. |
Remote Repositories
| Command | Description |
|---|---|
git remote add <name> <url> | Create a new connection to a remote repo. After adding a remote, you can use <name> as a shortcut for <url> in other commands. |
git fetch <remote> <branch> | Fetches a specific <branch>, from the repo. Leave off <branch> to fetch all remote refs. |
git pull <remote> | Fetch the specified remote’s copy of current branch and immediately merge it into the local copy. |
git push <remote> <branch> | Push the branch to <remote>, along with necessary commits and objects. Creates named branch in the remote repo if it doesn’t exist. |
Git Config
| Command | Description |
|---|---|
git config --global user.name <name> | Define the author name to be used for all commits by the current user. |
git config --global user.email <email> | Define the author email to be used for all commits by the current user. |
git config --global alias.<alias-name> <git-command> | Create shortcut for a Git command. E.g. alias.glog “log --graph --oneline” will set ”git glog”equivalent to ”git log --graph --oneline. |
git config --system core.editor <editor> | Set text editor used by commands for all users on the machine. <editor> arg should be the command that launches the desired editor (e.g., vi). |
git config --global --edit | Open the global configuration file in a text editor for manual editing. |
Git Log
| Command | Description |
|---|---|
git log -<limit> | Limit number of commits by <limit>. E.g. ”git log -5” will limit to 5 commits. |
git log --oneline | Condense each commit to a single line. |
git log --author="<pattern>" | Search for commits by a particular author. |
git log --grep="<pattern>" | Search for commits with a commit message that matches <pattern>. |
git log <since>..<until> | Show commits that occur between <since> and <until>.` Args can be a commit ID, branch name, HEAD, or any other kind of revision reference. |
git log -- <file> | Only display commits that have the specified file. |
git log --graph | –graph flag draws a text-based graph of commits on left side of commit msgs. |
Git Reset
| Command | Description |
|---|---|
git reset | Reset staging area to match most recent commit, but leave the working directory unchanged. |
git reset --hard | Reset staging area and working directory to match most recent commit and overwrites all changes in the working directory. |
git reset <commit> | Move the current branch tip backward to <commit>, reset the staging area to match, but leave the working directory alone. |
git reset --hard <commit> | Same as previous, but resets both the staging area & working directory to match. Deletes uncommitted changes, and all commits after <commit>. |
Git Rebase
| Command | Description |
|---|---|
git rebase -i <base> | Interactively rebase current branch onto <base>. Launches editor to enter commands for how each commit will be transferred to the new base. |
Git Pull
| Command | Description |
|---|---|
git pull --rebase <remote> | Fetch the remote’s copy of current branch and rebases it into the local copy. Uses git rebase instead of merge to integrate the branches. |
Git Push
| Command | Description |
|---|---|
git push <remote> --force | Forces the git push even if it results in a non-fast-forward merge. Do not use the --force flag unless you’re absolutely sure you know what you’re doing. |
git push <remote> --tags | Tags aren’t automatically pushed when you push a branch or use the --all flag. The --tags flag sends all of your local tags to the remote repo. |