Git Usage

仓库

# 在当前目录新建一个Git代码库
$ git init

# 将存储库克隆到本地
$ git clone [url]

# 下载对象
$ git fetch [url]

配置

# 显示当前的Git配置
$ git config --list

# 设置提交代码时的用户信息
$ git config [--global] user.name "[name]"
$ git config [--global] user.email "[email address]"

# 编辑Git配置文件
$ git config -e [--global]

修改

# 添加文件或目录到暂存区
$ git add [file/dir]

# 删除文件，并将删除操作保存在暂存区
$ git rm [file]

# 文件改名，并将改名操作保存在暂存区
$ git mv [old_file_name] [new_file_name]

# 将暂存区中信息提交到本地仓库
$ git commit -m [message]

# 提交一次新的 commit 代替上一次提交的 commit
$ gti commit --amend -m [message]

# 从另一个存储库或本地分支获取并与之整合
$ git pull

# 更新远程引用与相关对象，push 应先进行 pull 操作
$ git push

查看变更

# 显示有变更的文件
$ git status

# 显示当前分支的版本历史
$ git log

# 显示 commit 历史，以及每次 commit 发生变更的文件
$ git log --stat

# 显示指定文件相关的每一次diff
$ git log -p [file]

# 显示过去5次提交
$ git log -5 --pretty --oneline

# 显示指定文件是什么人在什么时间修改过
$ git blame [file]

# 显示暂存区和工作区的差异
$ git diff

# 显示两次提交之间的差异
$ git diff [first-branch]...[second-branch]

# 显示某次提交的元数据和内容变化
$ git show [commit]

# 显示某次提交时，某个文件的内容
$ git show [commit]:[filename]

分支

# 列出所有本地分支（-r 远程分支，-a 所有分支）
$ git branch

# 切换到 branch_name 分支
$ git checkout [branch_name]

# 创建名为 branch_name 的分支
$ git branch [branch_name]

# 创建并切换到分支 branch_name
$ git checkout -b [branch_name]

# 删除分支 branch_name
$ git branch -d [branch_name]

# 提交分支 branch_name 的信息到远程仓库
$ git push origin [branch_name]

合并

# 将 branch_name 合并到当前分支
$ git merge [branch_name]

# 取消合并操作
$ git merge --abort

# 将当前分支接续到 branch_name 上
$ git rebase [branch_name]

# 选择一个 commit 合并到当前位置
$ git cherry-pick [commit]

撤销

# 撤销当前修改
$ git reset HEADE^

# 通过添加新的修改来撤销原有修改
$ git revert HEAD

tag

# 列出所有 tag
$ git tag

# 新建一个tag在当前 commit
$ git tag [tag]

# 新建一个tag在指定 commit
$ git tag [tag] [commit]

# 删除本地tag
$ git tag -d [tag]

# 查看tag信息
$ git show [tag]

# 提交指定tag
$ git push [remote] [tag]

# 提交所有tag
$ git push [remote] --tags

# 新建一个分支，指向某个tag
$ git checkout -b [branch] [tag]

HEAD

$ git checkout <commit_id>

移动提交记录

# 将 commit_id 复制到当前位置下面
$ git cherry-pick <commit_id> ……

Git Submodule 管理项目子模块

# 递归的方式克隆整个项目
$ git clone [repository] --recursive

# 添加子模块
$ git submodule add [repository] addr>

# 初始化子模块
$ git submodule init

# 更新子模块
$ git submodule update

# 拉取所有子模块
$ git submodule foreach git pull

git usage

usage: git [--version] [--help] [-C <path>] [-c name=value]
           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
           <command> [<args>]
 
These are common Git commands used in various situations:

start a working area (see also: git help tutorial)
   clone      Clone a repository into a new directory
   init       Create an empty Git repository or reinitialize an existing one

work on the current change (see also: git help everyday)
   add        Add file contents to the index
   mv         Move or rename a file, a directory, or a symlink
   reset      Reset current HEAD to the specified state
   rm         Remove files from the working tree and from the index

examine the history and state (see also: git help revisions)
   bisect     Use binary search to find the commit that introduced a bug
   grep       Print lines matching a pattern
   log        Show commit logs
   show       Show various types of objects
   status     Show the working tree status

grow, mark and tweak your common history
   branch     List, create, or delete branches
   checkout   Switch branches or restore working tree files
   commit     Record changes to the repository
   diff       Show changes between commits, commit and working tree, etc
   merge      Join two or more development histories together
   rebase     Reapply commits on top of another base tip
   tag        Create, list, delete or verify a tag object signed with GPG

collaborate (see also: git help workflows)
   fetch      Download objects and refs from another repository
   pull       Fetch from and integrate with another repository or a local branch
   push       Update remote refs along with associated objects

'git help -a' and 'git help -g' list available subcommands and some
concept guides. See 'git help <command>' or 'git help <concept>'
to read about a specific subcommand or concept.

参考资料

• 罗杰·杜德勒. git - 简明指南
• Scott Chacon, Ben Straub. Pro git
• fanfeilong. Colorful Git
• . Learn Git Branching
• aneasystone. 搭建自己的 Git 服务器
• Prosa. Git帝国之tag大臣

赏

谢谢你请我吃糖果