git-cheatsheet

创建

克隆一个已存在的仓库

$ git clone ssh://user@domain.com/repo.git

Create a new local repository
创建一个新的仓库

$ git init

本地变化

LOCAL CHANGES
Changed files in your working directory
工作目录变化的文件

$ git status

Changes to tracked files
已跟踪文件的变化

$ git diff

Add all current changes to the next commit
增加当前目录的所有变更到下个提交

$ git add .

Add some changes in to the next commit

$ git add -p <file>

Commit all local changes in tracked files
提交所有变更

$ git commit -a

Commit previously staged changes

$ git commit

Change the last commit
Don‘t amend published commits!

$ git commit --amend

COMMIT HISTORY
Show all commits, starting with newest

$ git log

Show changes over time for a specific file

$ git log -p <file>

Who changed what and when in
什么人在什么时间和地点做了改变

$ git blame <file>

分支和标签

BRANCHES & TAGS
List all existing branches
展示所有已有的分支

$ git branch -av

Switch HEAD branch

$ git checkout <branch>

Create a new branch based on your current HEAD

$ git branch <new-branch>

Create a new tracking branch based on a remote branch

$ git checkout --track <remote/branch>

Delete a local branch

$ git branch -d <branch>

Mark the current commit with a tag

$ git tag <tag-name>

UPDATE & PUBLISH

List all currently configured remotes

$ git remote -v

Show information about a remote

$ git remote show <remote>

Add new remote repository, named

$ git remote add <shortname> <url>

Download all changes from ,but don‘t integrate into HEAD

$ git fetch <remote>

Download changes and directly merge/integrate into HEAD

$ git pull <remote> <branch>

Publish local changes on a remote

$ git push <remote> <branch>

Delete a branch on the remote

$ git branch -dr <remote/branch>

Publish your tags

$ git push --tags

MERGE & REBASE

Merge into your current HEAD

$ git merge <branch>

Rebase your current HEAD onto Don‘t rebase published commits!

$ git rebase <branch>

Abort a rebase

$ git rebase --abort

Continue a rebase after resolving conflicts

$ git rebase --continue

Use your configured merge tool to solve conflicts

$ git mergetool

Use your editor to manually solve conflicts and (after resolving) mark file as resolved

$ git add <resolved-file>
$ git rm <resolved-file>

UNDO

Discard all local changes in your working directory

$ git reset --hard HEAD

Discard local changes in a specific file

$ git checkout HEAD <file>

Revert a commit (by producing a new commit with contrary changes)

$ git revert <commit>

Reset your HEAD pointer to a previous commit
..and discard all changes since then

$ git reset --hard <commit>

…and preserve all changes as unstaged changes

$ git reset <commit>

…and preserve uncommitted local changes

$ git reset --keep <commit>