git merge 和 git rebase 有什么区别？

Merge 创建合并提交保留完整历史。Rebase 将提交重新应用到目标分支之上以获得线性历史。共享分支使用 merge，本地功能分支使用 rebase。

如何撤销上次提交？

使用 git reset --soft HEAD~1 撤销提交但保留更改在暂存区。使用 git reset HEAD~1 同时取消暂存。永远不要重置共享分支。

免费在线 Git 命令速查手册

Setup

git initInitialize a new repository

git clone <url>Clone a remote repository

git config --global user.name "<name>"Set global username

git config --global user.email "<email>"Set global email

Basic

git statusShow working tree status

git add <file>Stage changes

git add .Stage all changes

git commit -m "<msg>"Commit staged changes

git diffShow unstaged changes

git diff --stagedShow staged changes

Branching

git branchList branches

git branch <name>Create branch

git checkout <branch>Switch branch

git checkout -b <name>Create & switch branch

git merge <branch>Merge branch into current

git branch -d <name>Delete branch

Remote

git remote -vList remotes

git remote add origin <url>Add remote

git push origin <branch>Push to remote

git pull origin <branch>Pull from remote

git fetchFetch without merge

Undo

git reset HEAD <file>Unstage file

git checkout -- <file>Discard changes in file

git reset --soft HEAD~1Undo last commit (keep changes)

git reset --hard HEAD~1Undo last commit (discard)

git stashStash changes

git stash popApply stashed changes

Log

git log --onelineCompact log

git log --graph --onelineGraph log

git show <commit>Show commit details

git blame <file>Show line-by-line author